From 904f41249546070a0d4846662f5119e91afac864 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 9 Dec 2013 11:52:09 +0100 Subject: [PATCH] set correct postmaster_address (using -variable) for dovecot config-templates Signed-off-by: Michael Kaufmann (d00p) --- .../debian_squeeze/dovecot/etc_dovecot_dovecot.conf | 6 +++--- .../debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf | 2 +- .../freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf | 2 +- .../configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf | 2 +- .../opensuse_11_x/dovecot/etc_dovecot_dovecot.conf | 4 ++-- .../dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf | 2 +- .../dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf index 1f92f664..249b9280 100644 --- a/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf @@ -1,4 +1,4 @@ -protocols = imap pop3 +#protocols = imap pop3 listen = * mail_access_groups = vmail mail_debug = no @@ -25,8 +25,8 @@ protocol pop3 { } protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = + # postmaster is the one in charge of the mail system. MUST be set to a valid address! + postmaster_address = postmaster@ auth_socket_path = /var/run/dovecot/auth-master mail_plugins = quota sendmail_path = /usr/sbin/sendmail diff --git a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf index 6bae51a6..056da607 100644 --- a/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf +++ b/templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_15-lda.conf @@ -4,7 +4,7 @@ # Address to use when sending rejection mails. # Default is postmaster@. -#postmaster_address = +#postmaster_address = postmaster@ # Hostname to use in various parts of sent mails, eg. in Message-Id. # Default is the system's real hostname. diff --git a/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf b/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf index f9f14e9d..c1f8975f 100644 --- a/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf @@ -133,6 +133,6 @@ protocol imap { protocol lmtp { mail_plugins = $mail_plugins - postmaster_address = postmaster@example.net + postmaster_address = postmaster@ } diff --git a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf index 971b2628..b17f14e4 100644 --- a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf @@ -59,7 +59,7 @@ protocol lda { auth_socket_path = /var/run/dovecot/auth-master mail_plugins = quota # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = admin@ + postmaster_address = postmaster@ sendmail_path = /usr/sbin/sendmail lda_mailbox_autocreate = 1 } diff --git a/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf index 39c87b06..8d05a371 100644 --- a/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf @@ -25,8 +25,8 @@ protocol pop3 { } protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = + # postmaster is the one in charge of the mail system. MUST be set to a valid address! + postmaster_address = postmaster@ auth_socket_path = /var/run/dovecot/auth-master mail_plugins = quota sendmail_path = /usr/sbin/sendmail diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf index 508402f9..0565b2c4 100644 --- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf +++ b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf @@ -28,7 +28,7 @@ protocol pop3 { # LDA configuration protocol lda { # postmaster is the one in charge of the mail system. MUST be set to a valid address! - postmaster_address = + postmaster_address = postmaster@ mail_plugins = quota deliver_log_format = msgid=%m: %$ rejection_reason = Your message to <%t> was automatically rejected:%n%r diff --git a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf b/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf index af58c910..1d812fb5 100644 --- a/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf +++ b/templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf @@ -25,7 +25,7 @@ protocol pop3 { # LDA configuration protocol lda { - postmaster_address = postmaster + postmaster_address = postmaster@ mail_plugins = sieve quota quota_full_tempfail = yes deliver_log_format = msgid=%m: %$