OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jul-2007 18:07:04
Branch: HEAD Handle: 2007072717070300
Modified files:
openpkg-src/apache apache.spec rc.apache
Log:
Expected behavior of the 'restart' target is the same as invoking
'stop'/'start'. Alas, 'apache -k restart' implements just a HUP
signal. So we do an explicit 'stop'/'start' here to let Apache pick up
major configuration changes like loading of new or updated DSOs. While
being here, doing some cosmetics as well
Summary:
Revision Changes Path
1.423 +1 -1 openpkg-src/apache/apache.spec
1.27 +4 -4 openpkg-src/apache/rc.apache
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.422 -r1.423 apache.spec
--- openpkg-src/apache/apache.spec 23 Jul 2007 07:58:43 -0000 1.422
+++ openpkg-src/apache/apache.spec 27 Jul 2007 16:07:03 -0000 1.423
@@ -33,7 +33,7 @@
Group: Web
License: ASF
Version: 2.2.4
-Release: 20070723
+Release: 20070727
# package options
%option with_mpm_prefork yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/rc.apache
============================================================================
$ cvs diff -u -r1.26 -r1.27 rc.apache
--- openpkg-src/apache/rc.apache 23 Jun 2007 07:44:23 -0000 1.26
+++ openpkg-src/apache/rc.apache 27 Jul 2007 16:07:03 -0000 1.27
@@ -51,18 +51,18 @@
%stop -u @l_susr@
rcService apache enable yes || exit 0
- rcService apache active no && exit 0
+ rcService apache active no && exit 0
@l_prefix@/sbin/apache -k stop
sleep 2
%restart -u @l_susr@
rcService apache enable yes || exit 0
- rcService apache active no && exit 0
- @l_prefix@/sbin/apache -k restart
+ rcService apache active no && exit 0
+ rc apache stop start
%reload -u @l_susr@
rcService apache enable yes || exit 0
- rcService apache active no && exit 0
+ rcService apache active no && exit 0
@l_prefix@/sbin/apache -k graceful
%daily -u @l_susr@
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
