diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2016-07-10 04:58:41 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2016-07-10 04:58:41 +0200 |
| commit | c52344acb365be570a638f9f256cc33730ffa616 (patch) | |
| tree | 19205d1fc5fc4e0f678edabd6785b691e09150a4 | |
| parent | 1b744e0e6320dabaa62bc369addf7f0b89cdc107 (diff) | |
Postfix: avoid hardcoding the instance names.
| -rw-r--r-- | roles/IMAP/templates/etc/dovecot/conf.d/10-master.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/common/templates/etc/rsyslog.d/postfix.conf.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/IMAP/templates/etc/dovecot/conf.d/10-master.conf.j2 b/roles/IMAP/templates/etc/dovecot/conf.d/10-master.conf.j2 index aea7f87..b7aead3 100644 --- a/roles/IMAP/templates/etc/dovecot/conf.d/10-master.conf.j2 +++ b/roles/IMAP/templates/etc/dovecot/conf.d/10-master.conf.j2 @@ -56,7 +56,7 @@ service pop3-login { service lmtp { user = vmail - unix_listener /var/spool/postfix-mda/private/dovecot-lmtpd { + unix_listener /var/spool/postfix-{{ postfix_instance.IMAP.name }}/private/dovecot-lmtpd { group = postfix user = postfix mode = 0600 @@ -108,7 +108,7 @@ service auth { } # Postfix smtp-auth - unix_listener /var/spool/postfix-msa/private/dovecot-auth { + unix_listener /var/spool/postfix-{{ postfix_instance.MSA.name }}/private/dovecot-auth { group = postfix user = postfix mode = 0600 diff --git a/roles/common/templates/etc/rsyslog.d/postfix.conf.j2 b/roles/common/templates/etc/rsyslog.d/postfix.conf.j2 index 5acb56d..52f9ea3 100644 --- a/roles/common/templates/etc/rsyslog.d/postfix.conf.j2 +++ b/roles/common/templates/etc/rsyslog.d/postfix.conf.j2 @@ -13,5 +13,5 @@ $AddUnixListenSocket /var/spool/postfix-{{ postfix_instance[g].name }}/dev/log # 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 +if $programname == 'postfix-{{ postfix_instance.MSA.name }}' and $syslogfacility-text == 'mail' and $msg contains 'sasl_username=' then /var/log/mail.sasl {% endif %} |