- up to 2.4.12; fixes CVE-2014-3583, CVE-2014-3581, CVE-2014-8109, CVE-2013-5704

[packages/apache.git] / apache.logrotate

diff --git a/apache.logrotate b/apache.logrotate
index be2aacb55758f2fcf14c0827f23719406887fc88..2d05b37679755e5e30d1bc5a1c426b2a75324613 100644 (file)
--- a/apache.logrotate
+++ b/apache.logrotate
@@ -1,39 +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
-       /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
-    endscript
-}
-
-/var/log/httpd/*agent_log {
-    olddir /var/log/archiv/httpd
-    sharedscripts
-    postrotate
-       /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
-    endscript
-}
-
-/var/log/httpd/*error_log {
-    olddir /var/log/archiv/httpd
-    sharedscripts
-    postrotate
-       /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
-    endscript
-}
-
-/var/log/httpd/*referer_log {
-    olddir /var/log/archiv/httpd
-    sharedscripts
-    postrotate
-       /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
-    endscript
-}
-
-/var/log/httpd/*rewrite_log {
-    olddir /var/log/archiv/httpd
-    sharedscripts
-    postrotate
-       /etc/rc.d/init.d/httpd graceful > /dev/null 2>&1 || /bin/true
+       if /bin/systemd_booted; then
+               /bin/systemctl reload httpd.service
+       else
+               /sbin/service httpd flush-logs > /dev/null
+       fi
     endscript
 }