- add flush-logs target

Changed files:
    apache.init -> 1.55
    apache.logrotate -> 1.13

diff --git a/apache.init b/apache.init
index 64e6cadf45073a9ab399e448c89afa814229c441..c74b3fc766647a75971d2bdfbc7b56c117d4fbdc 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -86,6 +86,21 @@ case "$1" in
                RETVAL=7
        fi
        ;;
+  flush-logs)
+       if [ -f /var/lock/subsys/httpd ]; then
+               msg_reloading httpd.${HTTPD_MPM}
+
+               httpd.${HTTPD_MPM} -t >/dev/null 2>&1
+               RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       daemon httpd.${HTTPD_MPM} $CFG -k graceful
+                       RETVAL=$?
+               else
+                       fail
+                       echo >&2 "Configuration file syntax test failed."
+               fi
+       fi
+       ;;
   force-reload)
        if [ -f /var/lock/subsys/httpd ]; then
                run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t

diff --git a/apache.logrotate b/apache.logrotate
index 9712044b77bf3405b0744bc58ddc8a81c1822117..52d6f95ae75d0d63af120b92f6375d2c156fd573 100644 (file)
--- a/apache.logrotate
+++ b/apache.logrotate
@@ -9,6 +9,6 @@
     olddir /var/log/archiv/httpd
     sharedscripts
     postrotate
-               /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
+               /etc/rc.d/init.d/httpd flush-logs > /dev/null
     endscript
 }