Fixed #4650 dovecot postmaster_address

Till Brehm · Till Brehm · commit 47840eba49b3 · 2017-05-11T13:24:59.000+02:00
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
@@ -105,6 +105,7 @@ public function configure_dovecot()
 				copy('tpl/debian6_dovecot2.conf.master', $config_dir.'/'.$configfile);
 			}
 			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
+			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 			if(version_compare($dovecot_version,2.1) < 0) {
 				removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
 			}
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -443,6 +443,8 @@ public function configure_dovecot()
 			if(version_compare($dovecot_version,2.1) < 0) {
 				removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
 			}
+			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
+			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 		} else {
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master')) {
 				copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master', $config_dir.'/'.$configfile);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -450,6 +450,8 @@ public function configure_dovecot()
 			} else {
 				copy('tpl/opensuse_dovecot2.conf.master', $config_dir.'/'.$configfile);
 			}
+			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
+			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 		} else {
 			if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_dovecot.conf.master')) {
 				copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_dovecot.conf.master', $config_dir.'/'.$configfile);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1266,6 +1266,7 @@ public function configure_dovecot() {
 				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);
+			replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);
 			if(version_compare($dovecot_version, 2.1, '<')) {
 				removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
 			}

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ public function configure_dovecot()`
`105`	`105`	`copy('tpl/debian6_dovecot2.conf.master', $config_dir.'/'.$configfile);`
`106`	`106`	`}`
`107`	`107`	`replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
	`108`	`+ replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
`108`	`109`	`if(version_compare($dovecot_version,2.1) < 0) {`
`109`	`110`	`removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');`
`110`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,8 @@ public function configure_dovecot()`
`443`	`443`	`if(version_compare($dovecot_version,2.1) < 0) {`
`444`	`444`	`removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');`
`445`	`445`	`}`
	`446`	`+ replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
	`447`	`+ replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
`446`	`448`	`} else {`
`447`	`449`	`if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master')) {`
`448`	`450`	`copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master', $config_dir.'/'.$configfile);`
Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,8 @@ public function configure_dovecot()`
`450`	`450`	`} else {`
`451`	`451`	`copy('tpl/opensuse_dovecot2.conf.master', $config_dir.'/'.$configfile);`
`452`	`452`	`}`
	`453`	`+ replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
	`454`	`+ replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
`453`	`455`	`} else {`
`454`	`456`	`if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_dovecot.conf.master')) {`
`455`	`457`	`copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_dovecot.conf.master', $config_dir.'/'.$configfile);`
Original file line number	Diff line number	Diff line change
`@@ -1266,6 +1266,7 @@ public function configure_dovecot() {`
`1266`	`1266`	`copy('tpl/debian_dovecot2.conf.master', $config_dir.'/'.$configfile);`
`1267`	`1267`	`}`
`1268`	`1268`	`replaceLine($config_dir.'/'.$configfile, 'postmaster_address = postmaster@example.com', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
	`1269`	`+ replaceLine($config_dir.'/'.$configfile, 'postmaster_address = webmaster@localhost', 'postmaster_address = postmaster@'.$conf['hostname'], 1, 0);`
`1269`	`1270`	`if(version_compare($dovecot_version, 2.1, '<')) {`
`1270`	`1271`	`removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');`
`1271`	`1272`	`}`