diff options
author | elijah <elijah@riseup.net> | 2016-02-02 17:33:38 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2016-02-02 17:33:38 -0800 |
commit | cf50f84d47fe20f72aebdad1fa0c077c350e1d00 (patch) | |
tree | a2a4bed1a550f071df9c7fcc922269f1b3582a65 /puppet/modules/site_config/manifests | |
parent | 49c8a0c2a5ff413430b4bf7cc90f39f28c936b3e (diff) | |
parent | 45e81ca4abc81600998f11a5e74a565f545e6c84 (diff) |
Merge branch 'bugfix/mxlog' into develop
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r-- | puppet/modules/site_config/manifests/remove/files.pp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/puppet/modules/site_config/manifests/remove/files.pp b/puppet/modules/site_config/manifests/remove/files.pp index 4f7aa6e6..3efcbf0f 100644 --- a/puppet/modules/site_config/manifests/remove/files.pp +++ b/puppet/modules/site_config/manifests/remove/files.pp @@ -15,6 +15,7 @@ class site_config::remove::files { tidy { '/etc/default/leap_mx':; '/etc/logrotate.d/mx':; + '/etc/rsyslog.d/50-mx.conf':; } # @@ -30,11 +31,7 @@ class site_config::remove::files { 'leap_mx': path => '/var/log/', recurse => true, - matches => 'leap_mx*'; - 'mx': - path => '/var/log/leap/', - recurse => true, - matches => 'mx.log*'; + matches => ['leap_mx*', 'mx.log.[6-9](.gz)?', 'mx.log.[0-9][0-9](.gz)?']; '/srv/leap/webapp/public/provider.json':; '/srv/leap/couchdb/designs/tmp_users': recurse => true, |