Revision: 6694
http://ipcop.svn.sourceforge.net/ipcop/?rev=6694&view=rev
Author: owes
Date: 2012-07-08 17:19:41 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
httpd.conf needs to be patched for flash installation after update.
Change sed in installflash.sh to work with new httpd.conf.
Modified Paths:
--------------
ipcop/trunk/src/scripts/installflash.sh
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/src/scripts/installflash.sh
===================================================================
--- ipcop/trunk/src/scripts/installflash.sh 2012-07-08 16:12:34 UTC (rev
6693)
+++ ipcop/trunk/src/scripts/installflash.sh 2012-07-08 17:19:41 UTC (rev
6694)
@@ -68,6 +68,6 @@
# #
############################################################################
if [ -z "`/bin/grep \"Options ExecCGI FollowSymlinks\"
/etc/httpd/conf/httpd.conf`" ]; then
- sed -i -e s/"^\tOptions ExecCGI.*"/"\tOptions ExecCGI FollowSymlinks"/1
/etc/httpd/conf/httpd.conf
+ sed -i -e s/"^\s*Options ExecCGI.*"/" Options ExecCGI FollowSymlinks"/1
/etc/httpd/conf/httpd.conf
fi
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-08 16:12:34 UTC
(rev 6693)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-08 17:19:41 UTC
(rev 6694)
@@ -36,6 +36,7 @@
/usr/local/bin/scheduler.pl
/usr/local/bin/setaliases
/usr/local/bin/updatelists.pl
+/usr/local/sbin/installflash.sh
/usr/local/sbin/setup
/usr/local/sbin/updatekernel.pl
/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-07-08 16:12:34 UTC (rev 6693)
+++ ipcop/trunk/updates/2.1.0/setup 2012-07-08 17:19:41 UTC (rev 6694)
@@ -197,6 +197,10 @@
# Use new sshd
/usr/local/bin/restartssh
+# Patch apache config for flash
+if [ -e /etc/FLASH ]; then
+ sed -i -e s/"^\s*Options ExecCGI.*"/" Options ExecCGI FollowSymlinks"/1
/etc/httpd/conf/httpd.conf
+fi
# Use new apache (restart pauses for 10 seconds, should be enough to complete
upgrade)
/usr/local/bin/restarthttpd restart &
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
