- rel 4; make sure -n isn't true when MPM is empty

[packages/apache.git] / apache.logrotate

diff --git a/apache.logrotate b/apache.logrotate
index 4d046f1adb3712c0a742fc28d20f6f034c6216f9..2d05b37679755e5e30d1bc5a1c426b2a75324613 100644 (file)
--- a/apache.logrotate
+++ b/apache.logrotate
@@ -1,23 +1,18 @@
-/var/log/httpd/access_log {
+/var/log/httpd/*access_log
+/var/log/httpd/*combined_log
+/var/log/httpd/*agent_log
+/var/log/httpd/*error_log
+/var/log/httpd/*referer_log
+/var/log/httpd/*request_log
+/var/log/httpd/*rewrite_log
+{
+    olddir /var/log/archive/httpd
+    sharedscripts
     postrotate
-       /usr/bin/killall -HUP httpd
-    endscript
-}
-
-/var/log/httpd/agent_log {
-    postrotate
-       /usr/bin/killall -HUP httpd
-    endscript
-}
-
-/var/log/httpd/error_log {
-    postrotate
-       /usr/bin/killall -HUP httpd
-    endscript
-}
-
-/var/log/httpd/referer_log {
-    postrotate
-       /usr/bin/killall -HUP httpd
+       if /bin/systemd_booted; then
+               /bin/systemctl reload httpd.service
+       else
+               /sbin/service httpd flush-logs > /dev/null
+       fi
     endscript
 }