From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 27 Apr 2015 14:36:38 +0000 (+0200)
Subject: apache2.logrotate: rebase onto jessie
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=04e87b0b7dcc2de56dfa056b111615ee5e828760;p=mirror%2Fdsa-puppet.git

apache2.logrotate: rebase onto jessie
---

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
 }