apache2.logrotate: rebase onto jessie

[mirror/dsa-puppet.git] / modules / apache2 / files / apache2.logrotate

diff --git a/modules/apache2/files/apache2.logrotate b/modules/apache2/files/apache2.logrotate
index 9dd2f05..bc28f44 100644 (file)
--- a/modules/apache2/files/apache2.logrotate
+++ b/modules/apache2/files/apache2.logrotate
@@ -14,8 +14,13 @@
        create 644 root adm
        sharedscripts
        postrotate
-               if [ -f "`. /etc/apache2/envvars ; echo ${APACHE_PID_FILE:-/var/run/apache2.pid}`" ]; then
-                       /etc/init.d/apache2 reload > /dev/null
-               fi
+                if /etc/init.d/apache2 status > /dev/null ; then \
+                    /etc/init.d/apache2 reload > /dev/null; \
+                fi;
+       endscript
+       prerotate
+               if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
+                       run-parts /etc/logrotate.d/httpd-prerotate; \
+               fi; \
        endscript
 }