X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ffiles%2Fapache2.logrotate;h=bc28f44b31c97bb540ab6335f1420272d35d0441;hb=f403ded6ab91666029af18595ce44bf1797d1226;hp=9dd2f057ac07ed6cd884c36f05facf759addc7e6;hpb=909726404af7a8690a6df4290426f37fc315de53;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/files/apache2.logrotate b/modules/apache2/files/apache2.logrotate
index 9dd2f057a..bc28f44b3 100644
--- 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
 }