From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 11 Sep 2011 15:45:24 +0000 (+0200)
Subject: Set apache logrotate to 15 days for all hosts/services
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=97d2ec6762bb29d8289881503913f2bd54df3199;p=mirror%2Fdsa-puppet.git

Set apache logrotate to 15 days for all hosts/services
---

diff --git a/modules/apache2/files/common/etc/logrotate.d/apache2 b/modules/apache2/files/common/etc/logrotate.d/apache2
index 083816fb5..9dd2f057a 100644
--- a/modules/apache2/files/common/etc/logrotate.d/apache2
+++ b/modules/apache2/files/common/etc/logrotate.d/apache2
@@ -7,7 +7,7 @@
 	daily
 	dateext
 	missingok
-	rotate 360
+	rotate 15
 	compress
 	delaycompress
 	notifempty
diff --git a/modules/apache2/files/per-host/wieck.debian.org/etc/logrotate.d/apache2 b/modules/apache2/files/per-host/wieck.debian.org/etc/logrotate.d/apache2
deleted file mode 100644
index 9dd2f057a..000000000
--- a/modules/apache2/files/per-host/wieck.debian.org/etc/logrotate.d/apache2
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-/var/log/apache2/*.log {
-	daily
-	dateext
-	missingok
-	rotate 15
-	compress
-	delaycompress
-	notifempty
-	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
-	endscript
-}