summaryrefslogtreecommitdiffstats
path: root/roles/common/templates
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-06-30 03:34:50 +0200
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:52:09 +0200
commitee4345cfc93747587608f0a87497123a6cacb946 (patch)
tree1b8cf7efb15e66f695adf4ae8bc79dbe00683eba /roles/common/templates
parente1cc46486b686df85cf30073878c1ee69e320d1b (diff)
Log SASL usernames for longer, but don't include mail.log into syslog.
Diffstat (limited to 'roles/common/templates')
-rw-r--r--roles/common/templates/etc/rsyslog.d/postfix.conf.j217
1 files changed, 17 insertions, 0 deletions
diff --git a/roles/common/templates/etc/rsyslog.d/postfix.conf.j2 b/roles/common/templates/etc/rsyslog.d/postfix.conf.j2
new file mode 100644
index 0000000..5acb56d
--- /dev/null
+++ b/roles/common/templates/etc/rsyslog.d/postfix.conf.j2
@@ -0,0 +1,17 @@
+# Create an additional socket in postfix's chroot in order not to break
+# mail logging when rsyslog is restarted. If the directory is missing,
+# rsyslog will silently skip creating the socket.
+$AddUnixListenSocket /var/spool/postfix/dev/log
+{% for g in postfix_instance.keys() | sort %}
+{% if g in group_names %}
+$AddUnixListenSocket /var/spool/postfix-{{ postfix_instance[g].name }}/dev/log
+{% endif %}
+{% endfor %}
+
+{% if 'MSA' in group_names %}
+# User of our Authenticated SMTP server can choose the envelope from and From:
+# header of their choice. As the SASL username is not logged in the mail
+# header, we keep a mapping Postfix's message ID -> SASL username in a separate
+# log file that is only rotated monthly.
+if $programname == 'postfix-msa' and $syslogfacility-text == 'mail' and $msg contains 'sasl_username=' then /var/log/mail.sasl
+{% endif %}