Move logrotate

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/apache2/files/apache2.logrotate b/modules/apache2/files/apache2.logrotate
new file mode 100644 (file)
index 0000000..9dd2f05
--- /dev/null
+++ b/modules/apache2/files/apache2.logrotate
@@ -0,0 +1,21 @@
+##
+## 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
+}

diff --git a/modules/apache2/files/common/etc/logrotate.d/apache2 b/modules/apache2/files/common/etc/logrotate.d/apache2
deleted file mode 100644 (file)
index 9dd2f05..0000000
--- a/modules/apache2/files/common/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
-}