summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-07-05 10:21:08 -0700
committerelijah <elijah@riseup.net>2016-07-05 10:21:08 -0700
commitd1680b06cd50a2cc1088562cd0baab35361a1156 (patch)
tree501590f8a54f84f50b54a4e32b99f7ff47ba4d70
parent4f8a0036ef6b6617ec913ef627823d1182ccde87 (diff)
parent10602f677edc113b64f6a8fde6e9d0b87460967d (diff)
Merge branch '8021_rsyslog' of https://0xacab.org/micah/platform into develop
-rw-r--r--puppet/modules/site_rsyslog/templates/client.conf.erb1
1 files changed, 0 insertions, 1 deletions
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