diff --git a/group_vars/all b/group_vars/all index 05600b2..f94a926 100644 --- a/group_vars/all +++ b/group_vars/all @@ -18,3 +18,4 @@ ispmail_certificate_domains: ispmail_certificate_email: postmaster@example.org ispmail_certificate_days_valid: 3650 +ispmail_postmaster_address: postmaster@example.org diff --git a/roles/ispmail-dovecot/tasks/main.yml b/roles/ispmail-dovecot/tasks/main.yml index c518169..42ab2f9 100644 --- a/roles/ispmail-dovecot/tasks/main.yml +++ b/roles/ispmail-dovecot/tasks/main.yml @@ -27,7 +27,7 @@ copy: src=10-ssl.conf dest=/etc/dovecot/conf.d/10-ssl.conf notify: restart dovecot - name: Copying LDA configuration (10-lda.conf - enable sieve plugin) - copy: src=15-lda.conf dest=/etc/dovecot/conf.d/15-lda.conf + template: src=15-lda.conf.j2 dest=/etc/dovecot/conf.d/15-lda.conf notify: restart dovecot - name: Copying SQL access configuration (dovecot-ssql.conf.ext) template: src=dovecot-sql.conf.ext.j2 dest=/etc/dovecot/dovecot-sql.conf.ext diff --git a/roles/ispmail-dovecot/files/15-lda.conf b/roles/ispmail-dovecot/templates/15-lda.conf.j2 similarity index 95% rename from roles/ispmail-dovecot/files/15-lda.conf rename to roles/ispmail-dovecot/templates/15-lda.conf.j2 index 220503a..2d7ccc9 100644 --- a/roles/ispmail-dovecot/files/15-lda.conf +++ b/roles/ispmail-dovecot/templates/15-lda.conf.j2 @@ -4,11 +4,11 @@ # Address to use when sending rejection mails. # Default is postmaster@. %d expands to recipient domain. -#postmaster_address = +postmaster_address = {{ispmail_postmaster_address}} # Hostname to use in various parts of sent mails (e.g. in Message-Id) and # in LMTP replies. Default is the system's real hostname@domain. -#hostname = +#hostname = # If user is over quota, return with temporary failure instead of # bouncing the mail. @@ -32,7 +32,7 @@ #recipient_delimiter = + # Header where the original recipient address (SMTP's RCPT TO: address) is taken -# from if not available elsewhere. With dovecot-lda -a parameter overrides this. +# from if not available elsewhere. With dovecot-lda -a parameter overrides this. # A commonly used header for this is X-Original-To. #lda_original_recipient_header = @@ -46,4 +46,3 @@ protocol lda { # Space separated list of plugins to load (default is global mail_plugins). mail_plugins = $mail_plugins sieve } -