Procházet zdrojové kódy

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

Ralf S. Engelschall před 21 roky
rodič
revize
71718ecbe6
2 změnil soubory, kde provedl 4 přidání a 6 odebrání
  1. 1 1
      apache/apache.spec
  2. 3 5
      apache/rc.apache

+ 1 - 1
apache/apache.spec

@@ -66,7 +66,7 @@ Class:        BASE
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20040729
+Release:      20040813
 
 #   package options (suexec related)
 %option       with_suexec               yes

+ 3 - 5
apache/rc.apache

@@ -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@ \