summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-09-24 13:34:49 -0700
committerelijah <elijah@riseup.net>2015-09-24 13:34:49 -0700
commit14bcd5b08e3059e44e90f080c29fc6e8054cf193 (patch)
tree9ca968d8d5c6c1e4b5a4a800174871183a6b5ce5
parentbbc95640557e200a5a4e463f451ed647692dc0a3 (diff)
do not remove /var/log/leap/mx.log.*, this is where leap_mx is logging.
-rw-r--r--puppet/modules/site_config/manifests/remove_files.pp16
1 files changed, 10 insertions, 6 deletions
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index e2ab3c2e..776c3731 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -12,6 +12,16 @@
class site_config::remove_files {
#
+ # Platform 0.8 removals
+ #
+
+ tidy {
+ '/etc/apache/sites-enabled/leap_webapp.conf':
+ notify => Service['apache'];
+ }
+
+
+ #
# Platform 0.7 removals
#
@@ -23,16 +33,10 @@ class site_config::remove_files {
'/etc/logrotate.d/mx':;
'/etc/logrotate.d/stunnel':;
'/var/log/stunnel4/stunnel.log':;
- '/etc/apache/sites-enabled/leap_webapp.conf':
- notify => Service['apache'];
'leap_mx':
path => '/var/log/',
recurse => true,
matches => 'leap_mx*';
- 'leap_mx_rotate':
- path => '/var/log/leap/',
- recurse => true,
- matches => [ 'mx.log.[0-9]', 'mx.log.[0-9]?', 'mx.log.[6-9]?gz'];
'/srv/leap/webapp/public/provider.json':;
'/srv/leap/couchdb/designs/tmp_users':
recurse => true,