Revision: 6111
http://ipcop.svn.sourceforge.net/ipcop/?rev=6111&view=rev
Author: owes
Date: 2011-11-18 13:27:04 +0000 (Fri, 18 Nov 2011)
Log Message:
-----------
Make http on port 81 use the same image directory as https 8443, so we can
reuse all.
Modified Paths:
--------------
ipcop/trunk/config/httpd/port81.conf
ipcop/trunk/config/rootfiles/common/ipcop-gui
ipcop/trunk/updates/2.0.2/ROOTFILES.i486-2.0.2
ipcop/trunk/updates/2.0.2/setup
Added Paths:
-----------
ipcop/trunk/html/html/images/blacklogo.png
ipcop/trunk/html/html/images/redirect-background.jpg
Removed Paths:
-------------
ipcop/trunk/html/vhost81/html/images/blacklogo.png
ipcop/trunk/html/vhost81/html/images/redirect-background.jpg
Modified: ipcop/trunk/config/httpd/port81.conf
===================================================================
--- ipcop/trunk/config/httpd/port81.conf 2011-11-18 10:29:09 UTC (rev
6110)
+++ ipcop/trunk/config/httpd/port81.conf 2011-11-18 13:27:04 UTC (rev
6111)
@@ -7,10 +7,16 @@
Listen 81
<VirtualHost _default_:81>
- DocumentRoot /home/httpd/vhost81/html
- ScriptAlias /cgi-bin/ /home/httpd/vhost81/cgi-bin/
- <Directory /home/httpd/vhost81/cgi-bin>
- Options ExecCGI
- SetHandler cgi-script
- </Directory>
+ DocumentRoot /home/httpd/vhost81/html
+ ScriptAlias /cgi-bin/ /home/httpd/vhost81/cgi-bin/
+ Alias /images /home/httpd/html/images
+ <Directory /home/httpd/vhost81/cgi-bin>
+ Options ExecCGI
+ SetHandler cgi-script
+ </Directory>
+ # GUI for users to change their local proxy passwords
+ <Files chpasswd.cgi>
+ Satisfy Any
+ Allow from All
+ </Files>
</VirtualHost>
Modified: ipcop/trunk/config/rootfiles/common/ipcop-gui
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-gui 2011-11-18 10:29:09 UTC
(rev 6110)
+++ ipcop/trunk/config/rootfiles/common/ipcop-gui 2011-11-18 13:27:04 UTC
(rev 6111)
@@ -60,6 +60,7 @@
home/httpd/html/images/addfaint.gif
home/httpd/html/images/addgreen.gif
home/httpd/html/images/back.png
+home/httpd/html/images/blacklogo.png
home/httpd/html/images/bounceback.png
home/httpd/html/images/boxbottom1.png
home/httpd/html/images/boxbottom2.png
@@ -107,6 +108,7 @@
home/httpd/html/images/on.gif
home/httpd/html/images/openvpnzip.gif
home/httpd/html/images/reboot_cgi.png
+home/httpd/html/images/redirect-background.jpg
home/httpd/html/images/reload.gif
home/httpd/html/images/sflogo.gif
home/httpd/html/images/shieldedtux.png
@@ -137,8 +139,4 @@
home/httpd/vhost81/cgi-bin/chpasswd.cgi
home/httpd/vhost81/cgi-bin/redirect.cgi
home/httpd/vhost81/html
-home/httpd/vhost81/html/images
-home/httpd/vhost81/html/images/blacklogo.png
-home/httpd/vhost81/html/images/null.gif
-home/httpd/vhost81/html/images/redirect-background.jpg
home/httpd/vhost81/html/proxy.pac
Copied: ipcop/trunk/html/html/images/blacklogo.png (from rev 6110,
ipcop/trunk/html/vhost81/html/images/blacklogo.png)
===================================================================
(Binary files differ)
Copied: ipcop/trunk/html/html/images/redirect-background.jpg (from rev 6110,
ipcop/trunk/html/vhost81/html/images/redirect-background.jpg)
===================================================================
(Binary files differ)
Deleted: ipcop/trunk/html/vhost81/html/images/blacklogo.png
===================================================================
(Binary files differ)
Deleted: ipcop/trunk/html/vhost81/html/images/redirect-background.jpg
===================================================================
(Binary files differ)
Modified: ipcop/trunk/updates/2.0.2/ROOTFILES.i486-2.0.2
===================================================================
--- ipcop/trunk/updates/2.0.2/ROOTFILES.i486-2.0.2 2011-11-18 10:29:09 UTC
(rev 6110)
+++ ipcop/trunk/updates/2.0.2/ROOTFILES.i486-2.0.2 2011-11-18 13:27:04 UTC
(rev 6111)
@@ -1,10 +1,13 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/etc/httpd/conf/port81.conf
/home/httpd/cgi-bin/fwrulesadm.cgi
/home/httpd/cgi-bin/ipsec.cgi
/home/httpd/cgi-bin/openvpn.cgi
/home/httpd/cgi-bin/proxy.cgi
/home/httpd/cgi-bin/urlfilter.cgi
/home/httpd/cgi-bin/vpnca.cgi
+/home/httpd/html/images/blacklogo.png
+/home/httpd/html/images/redirect-background.jpg
/home/httpd/vhost81/cgi-bin/chpasswd.cgi
/usr/lib/ipcop/DataAccess.pl
/usr/local/bin/makesquidconf
Modified: ipcop/trunk/updates/2.0.2/setup
===================================================================
--- ipcop/trunk/updates/2.0.2/setup 2011-11-18 10:29:09 UTC (rev 6110)
+++ ipcop/trunk/updates/2.0.2/setup 2011-11-18 13:27:04 UTC (rev 6111)
@@ -73,6 +73,8 @@
# Update adds chpasswd.cgi on port 81
/bin/rm -f /home/httpd/cgi-bin/chpasswd.cgi
+# port 81 images directory no longer needed
+/bin/rm -rf /home/httpd/vhost81/html/images
# For new shared libs. May not always be required, but makes sure we do not
forget
/sbin/ldconfig
@@ -87,6 +89,9 @@
# Restart rsyslogd to activate new version
/usr/local/bin/restartsyslogd
+# Use new apache config (restart pauses for 10 seconds, should be enough to
complete upgrade)
+/usr/local/bin/restarthttpd restart &
+
#####
#
# End of version specific handling. Continue with universal stuff.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
