OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Aug-2004 21:20:39
Branch: HEAD Handle: 2004081320203900
Modified files:
openpkg-src/apache apache.spec rc.apache
Log:
do not %restart or %reload if the Apache configuration got broken (in
the meantime) and do a graceful restart in %reload, because for a
non-graceful we have %restart anyway
Summary:
Revision Changes Path
1.252 +1 -1 openpkg-src/apache/apache.spec
1.18 +3 -5 openpkg-src/apache/rc.apache
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.251 -r1.252 apache.spec
--- openpkg-src/apache/apache.spec 29 Jul 2004 17:28:38 -0000 1.251
+++ openpkg-src/apache/apache.spec 13 Aug 2004 19:20:39 -0000 1.252
@@ -66,7 +66,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20040729
+Release: 20040813
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/rc.apache
============================================================================
$ cvs diff -u -r1.17 -r1.18 rc.apache
--- openpkg-src/apache/rc.apache 12 Jan 2004 18:34:38 -0000 1.17
+++ openpkg-src/apache/rc.apache 13 Aug 2004 19:20:39 -0000 1.18
@@ -52,18 +52,18 @@
%restart -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active no && exit 0
+ @l_prefix@/sbin/apache -t || exit $?
rc apache stop start
%reload -u @l_susr@
rcService apache enable yes || exit 0
rcService apache active no && exit 0
- apache_signal HUP
+ @l_prefix@/sbin/apache -t || exit $?
+ apache_signal USR1
%daily -u @l_susr@
rcService apache enable yes || exit 0
-
if [ ".$apache_log_files" != . ]; then
- # rotate logfile
shtool rotate -f \
-n ${apache_log_numfiles} -s ${apache_log_minsize} -d \
-z ${apache_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
@@ -71,9 +71,7 @@
-E "${apache_log_epilog} && rc apache reload" \
$apache_log_files
fi
-
if [ ".$apache_err_files" != . ]; then
- # rotate errfile
shtool rotate -f \
-n ${apache_err_numfiles} -s ${apache_err_minsize} -d \
-z ${apache_err_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
