summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-04-12 10:04:48 -0400
committerMicah <micah@leap.se>2016-04-12 14:20:46 -0400
commitfead715f94551eb3600e449659ad6df12fffe641 (patch)
tree4102def9984dbb24a7bd7f03a34dacec8084c420 /puppet/modules/site_config/manifests
parent15b83d88dcedab496a19cef57f11c5c8e091dd4a (diff)
Remove duplicate mail logging (#8021)
Add a site_rsyslog config that removes duplicate mail logging. Previously mail logs would be copied to /var/log/syslog, mail.log, mail.err, mail.info, maillog and to the console. This removes those and only puts them in /var/log/mail.log. It also removes other superfluous configurations, either because they are commented out already, or because they are uucp or nntp. Change-Id: Ib05036787d2c818bf8802c22a4b8050f945a6e6d
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/syslog.pp5
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/syslog.pp b/puppet/modules/site_config/manifests/syslog.pp
index d1deefcd..591e0601 100644
--- a/puppet/modules/site_config/manifests/syslog.pp
+++ b/puppet/modules/site_config/manifests/syslog.pp
@@ -23,8 +23,9 @@ class site_config::syslog {
}
class { '::rsyslog::client':
- log_remote => false,
- log_local => true
+ log_remote => false,
+ log_local => true,
+ custom_config => 'site_rsyslog/client.conf.erb'
}
rsyslog::snippet { '00-anonymize_logs':