summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-04-17 10:19:37 -0700
committerelijah <elijah@riseup.net>2015-04-17 10:19:37 -0700
commit64cc83793aa35b84b60dd40305c7edf8369a187b (patch)
tree666ac2753ceca7c01832756fd9c7065ea23718bc /puppet/modules
parente97a00725c80a4067d5bba24d931b1a3bcf2ad96 (diff)
rename leap-mx logrotate file; minor style change.
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/leap/manifests/logfile.pp4
-rw-r--r--puppet/modules/leap_mx/manifests/init.pp2
-rw-r--r--puppet/modules/site_config/manifests/remove_files.pp2
3 files changed, 4 insertions, 4 deletions
diff --git a/puppet/modules/leap/manifests/logfile.pp b/puppet/modules/leap/manifests/logfile.pp
index 4deafacb..c5c185f6 100644
--- a/puppet/modules/leap/manifests/logfile.pp
+++ b/puppet/modules/leap/manifests/logfile.pp
@@ -2,8 +2,8 @@
# make syslog log to a particular file for a particular process.
#
-define leap::logfile($process=$title) {
- $logfile = "/var/log/leap/${title}.log"
+define leap::logfile($process=$name) {
+ $logfile = "/var/log/leap/${name}.log"
rsyslog::snippet { "50-${name}":
content => "if \$programname startswith '${process}' then ${logfile}
diff --git a/puppet/modules/leap_mx/manifests/init.pp b/puppet/modules/leap_mx/manifests/init.pp
index 0d15d053..6bcdd19a 100644
--- a/puppet/modules/leap_mx/manifests/init.pp
+++ b/puppet/modules/leap_mx/manifests/init.pp
@@ -78,7 +78,7 @@ class leap_mx {
augeas {
"logrotate_mx":
- context => "/files/etc/logrotate.d/mx/rule",
+ context => "/files/etc/logrotate.d/leap-mx/rule",
changes => [
"set file /var/log/leap/mx.log",
'set rotate 5',
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp
index cc5fc174..44e3e47b 100644
--- a/puppet/modules/site_config/manifests/remove_files.pp
+++ b/puppet/modules/site_config/manifests/remove_files.pp
@@ -20,7 +20,7 @@ class site_config::remove_files {
'/etc/rsyslog.d/99-leap-mx.conf':;
'/etc/rsyslog.d/01-webapp.conf':;
'/etc/rsyslog.d/50-stunnel.conf':;
- '/etc/logrotate.d/leap-mx':;
+ '/etc/logrotate.d/mx':;
'/etc/logrotate.d/stunnel':;
'/var/log/stunnel4/stunnel.log':;
'leap_mx':