summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-07-14 03:06:53 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:53:09 +0200
commitb6ab225539b9b88803e8fe7e58fc65454120366b (patch)
tree2a4ed8a2fe80d3cf5204e1d9345d966534c5c094
parent9516d25e869b5f704297442a9b28751081410f55 (diff)
Don't merge amavis' logs into /var/log/syslog.
As they contain user information, we keep it in /var/log/mail.log only. These logs are kept for 3 days "only", as per our policy.
-rw-r--r--roles/common/files/etc/rsyslog.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/common/files/etc/rsyslog.conf b/roles/common/files/etc/rsyslog.conf
index 4f07d9b..10f400a 100644
--- a/roles/common/files/etc/rsyslog.conf
+++ b/roles/common/files/etc/rsyslog.conf
@@ -54,41 +54,41 @@ $IncludeConfig /etc/rsyslog.d/*.conf
###############
#### RULES ####
###############
#
# Logging for the mail system. Split it up so that
# it is easy to write scripts to parse these files.
#
mail.* -/var/log/mail.log
mail.info -/var/log/mail.info
mail.warn -/var/log/mail.warn
mail.err /var/log/mail.err
# To preserve the privacy of our users, we stop processing relevant log
# entries (eg, we don't put them into /var/log/syslog) that are of
# severity info and lower. Those lines are put into mail.log and
# mail.info for troubleshooting, but those files are rotated frequently.
# XXX: we should improve that: we shouldn't log envelopes and IPs unless
# the mail is bounced, for instance.
-if ($programname startswith 'postfix-' or $programname == 'dovecot') and $syslogfacility-text == 'mail' and $syslogseverity >= 6 then ~
+if ($programname startswith 'postfix-' or $programname == 'dovecot' or $programname == 'amavis') and $syslogfacility-text == 'mail' and $syslogseverity >= 6 then ~
#
# Some standard log files. Log by facility.
#
auth,authpriv.* /var/log/auth.log
*.*;auth,authpriv.none -/var/log/syslog
#cron.* /var/log/cron.log
daemon.* -/var/log/daemon.log
kern.* -/var/log/kern.log
lpr.* -/var/log/lpr.log
user.* -/var/log/user.log
#
# Logging for INN news system.
#
news.crit /var/log/news/news.crit
news.err /var/log/news/news.err
news.notice -/var/log/news/news.notice
#