X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache.logrotate;h=2d05b37679755e5e30d1bc5a1c426b2a75324613;hb=75cb1b72ab6db8fb68164774c47b9392763d2e09;hp=46bde77378d9b3196350b44a36ad9a210f6b3623;hpb=cc1cc2ef3056443e843ca49ef0327d681caa713e;p=packages%2Fapache.git

diff --git a/apache.logrotate b/apache.logrotate
index 46bde77..2d05b37 100644
--- a/apache.logrotate
+++ b/apache.logrotate
@@ -1,27 +1,18 @@
-/var/log/httpd/access_log {
-    olddir /var/log/archiv/httpd
+/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 {
-    olddir /var/log/archiv/httpd
-    postrotate
-	/usr/bin/killall -HUP httpd
-    endscript
-}
-
-/var/log/httpd/error_log {
-    olddir /var/log/archiv/httpd
-    postrotate
-	/usr/bin/killall -HUP httpd
-    endscript
-}
-
-/var/log/httpd/referer_log {
-    olddir /var/log/archiv/httpd
-    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
 }