From 45e81ca4abc81600998f11a5e74a565f545e6c84 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 2 Feb 2016 10:21:49 -0800 Subject: finally fix leap-mx logging, for the last time, hopefully. --- puppet/modules/site_config/manifests/remove/files.pp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'puppet/modules/site_config/manifests/remove') 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, -- cgit v1.2.3