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 083816fb5e0c88eb5e83b3a8f5007828e97f2b1c..9dd2f057ac07ed6cd884c36f05facf759addc7e6 100644 (file)
--- 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 (file)
index 9dd2f05..0000000
--- 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
-}