Revision: 7523
http://sourceforge.net/p/ipcop/svn/7523
Author: owes
Date: 2014-05-06 18:42:29 +0000 (Tue, 06 May 2014)
Log Message:
-----------
Make more use of restarthttpd script.
Modified Paths:
--------------
ipcop/trunk/src/rc.d/rc.sysinit
ipcop/trunk/src/scripts/setreservedports.pl
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
Modified: ipcop/trunk/src/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/src/rc.d/rc.sysinit 2014-05-05 18:27:17 UTC (rev 7522)
+++ ipcop/trunk/src/rc.d/rc.sysinit 2014-05-06 18:42:29 UTC (rev 7523)
@@ -402,7 +402,7 @@
test_ok
echo -ne "Starting httpd ... "
-/usr/sbin/httpd
+/usr/local/bin/restarthttpd
test_ok
echo -ne "Starting dhcpd (if enabled) ... "
/usr/local/bin/restartdhcp --boot
Modified: ipcop/trunk/src/scripts/setreservedports.pl
===================================================================
--- ipcop/trunk/src/scripts/setreservedports.pl 2014-05-05 18:27:17 UTC (rev
7522)
+++ ipcop/trunk/src/scripts/setreservedports.pl 2014-05-06 18:42:29 UTC (rev
7523)
@@ -13,12 +13,11 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
# $Id$
#
-# Copyright (c) 2009-2010 The IPCop Team
+# Copyright (c) 2009-2014 The IPCop Team
#
#
# Just a note: existing connections will not be cut when changing ports.
@@ -111,11 +110,10 @@
system("/bin/sed", "-i", "-e", "s+^Listen .*\$+Listen $portgui+",
"-e", "s+^<VirtualHost _default_:.*\$+<VirtualHost
_default_:$portgui>+",
"/etc/httpd/conf/portgui.conf");
+ # Not needed to start httpd during installation
if (-e '/var/run/httpd.pid') {
- print "Restarting httpd ... \n";
- system("/usr/bin/killall httpd");
- sleep 2;
- system("/usr/sbin/httpd");
+ print 'Restarting httpd ... \n';
+ system('/usr/local/bin/restarthttpd --restart');
}
# Inform squid
@@ -157,6 +155,7 @@
print "Change sshd configuration ... \n";
system("/bin/sed", "-i", "-e", "s+Port .*\$+Port $portssh+",
"/etc/ssh/sshd_config");
+ # Not needed to start sshd during installation
if (-e '/var/run/sshd.pid') {
my %sshsettings = ();
&General::readhash('/var/ipcop/remote/settings', \%sshsettings);
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-05 18:27:17 UTC
(rev 7522)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-05-06 18:42:29 UTC
(rev 7523)
@@ -1,7 +1,9 @@
## please place IPCop files first, then packages sorted by alphabetical order
/etc/logrotate.d/squid
/etc/logrotate.d/squidGuard
+/etc/rc.d/rc.sysinit
/home/httpd/cgi-bin/proxy.cgi
+/usr/local/bin/setreservedports.pl
##
## openssl patched
/usr/lib/libssl.so.1.0.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
