From 10602f677edc113b64f6a8fde6e9d0b87460967d Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 5 Jul 2016 13:01:21 -0400 Subject: Remove duplicate syslog entry (#8021). In an attempt to resolve #8021, a template error was made, causing duplicated entries to appear in the rsyslog template. Change-Id: Ic41d6ef9aec9865cf64312c1eb96e408b39d441c --- puppet/modules/site_rsyslog/templates/client.conf.erb | 1 - 1 file changed, 1 deletion(-) (limited to 'puppet/modules/site_rsyslog') diff --git a/puppet/modules/site_rsyslog/templates/client.conf.erb b/puppet/modules/site_rsyslog/templates/client.conf.erb index 7f94759d..553b8373 100644 --- a/puppet/modules/site_rsyslog/templates/client.conf.erb +++ b/puppet/modules/site_rsyslog/templates/client.conf.erb @@ -93,7 +93,6 @@ auth,authpriv.* /var/log/secure <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # First some standard log files. Log by facility. # -*.*;auth,authpriv.none -/var/log/syslog cron.* /var/log/cron.log daemon.* -/var/log/daemon.log kern.* -/var/log/kern.log -- cgit v1.2.3 From c6aea725ed673a50ad0c9291c2f90ade44f20d8c Mon Sep 17 00:00:00 2001 From: Micah Date: Fri, 19 Aug 2016 08:21:06 -0400 Subject: Fix rsyslog auth.log entries (#8381). The auth.log rsyslog entry was accidentally removed in #7863. Change-Id: I4ebffeafedbca5df902041ddd2bcb80d3f68b230 --- puppet/modules/site_rsyslog/templates/client.conf.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_rsyslog') diff --git a/puppet/modules/site_rsyslog/templates/client.conf.erb b/puppet/modules/site_rsyslog/templates/client.conf.erb index 553b8373..12d6ea9b 100644 --- a/puppet/modules/site_rsyslog/templates/client.conf.erb +++ b/puppet/modules/site_rsyslog/templates/client.conf.erb @@ -83,7 +83,7 @@ $ActionSendStreamDriverAuthMode anon <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # Log auth messages locally -.*;auth,authpriv.none;mail.none -/var/log/syslog +auth,authpriv.* /var/log/auth.log <% elsif scope.lookupvar('rsyslog::log_style') == 'redhat' -%> # Log auth messages locally auth,authpriv.* /var/log/secure @@ -93,6 +93,7 @@ auth,authpriv.* /var/log/secure <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # First some standard log files. Log by facility. # +*.*;auth,authpriv.none;mail.none -/var/log/syslog cron.* /var/log/cron.log daemon.* -/var/log/daemon.log kern.* -/var/log/kern.log -- cgit v1.2.3 From d0532dbe3463a2103ae4a0757c5168478a1ffb99 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 23 Aug 2016 09:08:27 -0400 Subject: syslog: remove duplicate messages (#8405). Change-Id: I90f8d160d2293288066847bcc199f480d06d877d --- puppet/modules/site_rsyslog/templates/client.conf.erb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'puppet/modules/site_rsyslog') diff --git a/puppet/modules/site_rsyslog/templates/client.conf.erb b/puppet/modules/site_rsyslog/templates/client.conf.erb index 12d6ea9b..1a1e4b6d 100644 --- a/puppet/modules/site_rsyslog/templates/client.conf.erb +++ b/puppet/modules/site_rsyslog/templates/client.conf.erb @@ -106,10 +106,6 @@ user.* -/var/log/user.log *.=debug;\ auth,authpriv.none;\ news.none;mail.none -/var/log/debug -*.=info;*.=notice;*.=warn;\ - auth,authpriv.none;\ - cron,daemon.none;\ - mail,news.none -/var/log/messages # Log anything (except mail) of level info or higher. # Don't log private authentication messages! -- cgit v1.2.3