diff options
| author |   Nicholas Jones <carpaski@gentoo.org> | 2002-09-14 14:22:52 +0000 |
|---|---|---|
| committer | Nicholas Jones <carpaski@gentoo.org> | 2002-09-14 14:22:52 +0000 |
| commit | 7593b6575509dde545ee1b0f75cc4dbf2c1bdbc7 (patch) | |
| tree | 804ccb098a8ae93658c3ca7bf7ea017af3e1b4f0 /net-www/apache | |
| parent | Forgot a file for apache2 move. (diff) | |
| download | gentoo-2-7593b6575509dde545ee1b0f75cc4dbf2c1bdbc7.tar.gz gentoo-2-7593b6575509dde545ee1b0f75cc4dbf2c1bdbc7.tar.bz2 gentoo-2-7593b6575509dde545ee1b0f75cc4dbf2c1bdbc7.zip | |
Added "graceful"/proper restarts to both versions of Apache.
Diffstat (limited to 'net-www/apache')
| -rw-r--r-- | net-www/apache/ChangeLog | 10 | ||||
| -rw-r--r-- | net-www/apache/files/2.0.40/apache2.initd | 3 | ||||
| -rw-r--r-- | net-www/apache/files/apache.rc6 | 14 |
3 files changed, 21 insertions, 6 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 7e1850415978..d215a8bc7c36 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -3,7 +3,11 @@ *apache-2.0.40-r1 (04 Sept 2002) - 04 Sept 2002; Nicholas Jones <carpaski@gentoo.org> : + 14 Sep 2002; Nicholas Jones <carpaski@gentoo.org> : + Added the capability for a graceful restart. Should ensure that + the server, when restarted, actually dies before it's started again. + + 04 Sep 2002; Nicholas Jones <carpaski@gentoo.org> : Made it path compliant. Fixed the modules files. Fixed the init.d and conf.d files. Still needs default configs and more tuning. @@ -14,6 +18,10 @@ *apache-1.3.26-r4 (3 Jul 2002) + 14 Sep 2002; Nicholas Jones <carpaski@gentoo.org> : + Added the capability for a graceful restart. Should ensure that + the server, when restarted, actually dies before it's started again. + 14 Sep 2002; Donny Davies <woodchip@gentoo.org> mime_type_fix : Add x-ogg; #7245. Cleanup. diff --git a/net-www/apache/files/2.0.40/apache2.initd b/net-www/apache/files/2.0.40/apache2.initd index c341f3e5b95b..b101df2aedeb 100644 --- a/net-www/apache/files/2.0.40/apache2.initd +++ b/net-www/apache/files/2.0.40/apache2.initd @@ -23,8 +23,7 @@ stop() { eend $? } -# NOT LEGAL... Need to work on this... -reload() { +svc_restart() { ebegin "Reloading apache2" /usr/lib/apache2/bin/httpd -k reload ${APACHE2_OPTS} eend $? diff --git a/net-www/apache/files/apache.rc6 b/net-www/apache/files/apache.rc6 index b6abe52827c9..3798b0504820 100644 --- a/net-www/apache/files/apache.rc6 +++ b/net-www/apache/files/apache.rc6 @@ -1,11 +1,11 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.2 2002/07/27 09:10:32 carpaski Exp $ +# /space/gentoo/cvsroot/gentoo-x86/net-www/apache/files/apache.rc6,v 1.1 2002/04/09 23:51:39 woodchip Exp depend() { need net - use mysql named + use mysql } start() { @@ -17,6 +17,14 @@ start() { stop() { ebegin "Stopping apache" - start-stop-daemon --quiet --stop --pidfile /var/run/apache.pid + /usr/sbin/apachectl stop + start-stop-daemon -o --quiet --stop --pidfile /var/run/apache.pid eend $? } + +svc_restart() { + ebegin "Gracefully restarting apache" + /usr/sbin/apachectl graceful + eend $? +} + |