summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2015-12-10 15:55:57 -0500
committerMicah <micah@leap.se>2015-12-15 15:37:52 -0500
commit73624f1e87974ab71b5d8e44073347725e492e5c (patch)
tree7abe7184e464ba65e526f41592a0c2bd30e7d86c /puppet/modules
parent1f9da0490a3d55831e2b834ab5801c629123d226 (diff)
Have leap-mx log with the process name 'leap-mx', but log to
/var/log/leap/mx.log, and clean up the files associated with the previous configuration (#7691) Change-Id: Id08c97980292968e8e89f128afb5fa78bda30069
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp2
-rw-r--r--puppet/modules/site_config/manifests/remove/files.pp10
2 files changed, 4 insertions, 8 deletions
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 055a57ef..5c356315 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -60,7 +60,7 @@ class leap_mx {
notify => Service['leap-mx'];
}
- leap::logfile { 'mx': }
+ leap::logfile { 'mx': process => 'leap-mx' }
#
# LEAP-MX CODE AND DEPENDENCIES
diff --git a/puppet/modules/site_config/manifests/remove/files.pp b/puppet/modules/site_config/manifests/remove/files.pp
index 67171259..077381e1 100644
--- a/puppet/modules/site_config/manifests/remove/files.pp
+++ b/puppet/modules/site_config/manifests/remove/files.pp
@@ -14,7 +14,7 @@ class site_config::remove::files {
# Platform 0.8 removals
tidy {
'/etc/default/leap_mx':;
- '/etc/logrotate.d/leap-mx':;
+ '/etc/logrotate.d/mx':;
}
#
@@ -23,7 +23,6 @@ class site_config::remove::files {
tidy {
'/etc/rsyslog.d/99-tapicero.conf':;
- '/etc/rsyslog.d/99-leap-mx.conf':;
'/etc/rsyslog.d/01-webapp.conf':;
'/etc/rsyslog.d/50-stunnel.conf':;
'/etc/logrotate.d/stunnel':;
@@ -32,13 +31,10 @@ class site_config::remove::files {
path => '/var/log/',
recurse => true,
matches => 'leap_mx*';
- # We rotate 5 logs, so we should only have mx.log, mx.log.[1-5], with an
- # optional .gz suffix. The following will remove any logs that are out
- # of this range
- 'leap_mx_rotate':
+ 'mx':
path => '/var/log/leap/',
recurse => true,
- matches => [ 'mx.log.[6-9](.gz)?', 'mx.log.[0-9][0-9]'];
+ matches => 'mx.log*';
'/srv/leap/webapp/public/provider.json':;
'/srv/leap/couchdb/designs/tmp_users':
recurse => true,