Merge branch '5756-postconf-warnings-during-upgrade-to-3-2b2' into 'develop'

Till Brehm · Till Brehm · commit 68e4346f20a2 · 2020-09-22T14:02:39.000+02:00
Resolve "postconf warnings during upgrade to 3.2b2"

Closes #5756

See merge request ispconfig/ispconfig3!1202
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1169,6 +1169,9 @@ public function configure_postfix($options = '') {
 		    $postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));
 		}
 
+		// Remove comment lines, these would give fatal errors when passed to postconf.
+		$postconf_commands = array_filter($postconf_commands, function($line) { return preg_match('/^[^#]/', $line); });
+
 		//* These postconf commands will be executed on installation only
 		if($this->is_update == false) {
 			$postconf_commands = array_merge($postconf_commands, array(

Original file line number	Diff line number	Diff line change
`@@ -1169,6 +1169,9 @@ public function configure_postfix($options = '') {`
`1169`	`1169`	`$postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));`
`1170`	`1170`	`}`
`1171`	`1171`
	`1172`	`+ // Remove comment lines, these would give fatal errors when passed to postconf.`
	`1173`	`+ $postconf_commands = array_filter($postconf_commands, function($line) { return preg_match('/^[^#]/', $line); });`
	`1174`	`+`
`1172`	`1175`	`//* These postconf commands will be executed on installation only`
`1173`	`1176`	`if($this->is_update == false) {`
`1174`	`1177`	`$postconf_commands = array_merge($postconf_commands, array(`