Fixed: FS#3116 - Debian 64 Wheezy Dovcot - add postmmaster_address line to template

Till Brehm · Till Brehm · commit 65576fefcbe1 · 2014-02-16T12:03:29.000+01:00
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -971,6 +971,7 @@ public function configure_dovecot() {
 			} else {
 				copy('tpl/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);
 			}
+			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 		} else {
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master')) {
 				copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master', $config_dir.'/'.$configfile);
diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
@@ -4,6 +4,7 @@ auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
 mail_privileged_group = vmail
+postmaster_address = postmaster@example.com
 ssl_cert = </etc/postfix/smtpd.cert
 ssl_key = </etc/postfix/smtpd.key
 passdb {

Original file line number	Diff line number	Diff line change
`@@ -971,6 +971,7 @@ public function configure_dovecot() {`
`971`	`971`	`} else {`
`972`	`972`	`copy('tpl/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);`
`973`	`973`	`}`
	`974`	`+ replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
`974`	`975`	`} else {`
`975`	`976`	`if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master')) {`
`976`	`977`	`copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_dovecot.conf.master', $config_dir.'/'.$configfile);`