fixed installer - ispconfig/ispconfig3#3750

Author: Florian Schaal

install/dist/lib/debian60.lib.php

@@ -53,8 +53,9 @@ public function configure_dovecot()
 		$config_dir = $conf['postfix']['config_dir'];
 		//* Configure master.cf and add a line for deliver
 		if ($this->postfix_master()) {
-			exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
- 			$add_dovecot_service = @($out[0]=='')?true:false;
+			exec ("postconf -M dovecot.unix", $out, $ret); //* Postfix 2.9
+			if (!isset($out[0])) exec ("postconf -M dovecot/unix", $out, $ret); //* Postfix >= 2.11
+			$add_dovecot_service = @($out[0]=='')?true:false;
 		} else { //* fallback - postfix < 2.9
 			$content = rf($config_dir.'/master.cf');
 			$add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;

install/dist/lib/fedora.lib.php

@@ -352,7 +352,8 @@ public function configure_dovecot()
 		$config_dir = $conf['postfix']['config_dir'];
 		//* Configure master.cf and add a line for deliver
 		if ($this->postfix_master()) {
-			exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
+			exec ("postconf -M dovecot.unix", $out, $ret); //* Postfix 2.9
+			if (!isset($out[0])) exec ("postconf -M dovecot/unix", $out, $ret); //* Postfix >= 2.11
 			$add_dovecot_service = @($out[0]=='')?true:false;
 		} else { //* fallback - postfix < 2.9
 			$content = rf($config_dir.'/master.cf');

install/dist/lib/gentoo.lib.php

@@ -273,7 +273,8 @@ public function configure_dovecot()
 		$config_dir = $conf['postfix']['config_dir'];
 		//* Configure master.cf and add a line for deliver
 		if ($this->postfix_master()) {
-			exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
+			exec ("postconf -M dovecot.unix", $out, $ret); //* Postfix 2.9
+			if (!isset($out[0])) exec ("postconf -M dovecot/unix", $out, $ret); //* Postfix >= 2.11
 			$add_dovecot_service = @($out[0]=='')?true:false;
 		} else { //* fallback - postfix < 2.9
 			$content = rf($config_dir.'/master.cf');

install/dist/lib/opensuse.lib.php

@@ -367,7 +367,8 @@ public function configure_dovecot()
 		$config_dir = $conf['postfix']['config_dir'];
 		//* Configure master.cf and add a line for deliver
 		if ($this->postfix_master()) {
-			exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
+			exec ("postconf -M dovecot.unix", $out, $ret); //* Postfix 2.9
+			if (!isset($out[0])) exec ("postconf -M dovecot/unix", $out, $ret); //* Postfix >= 2.11
 			$add_dovecot_service = @($out[0]=='')?true:false;
 		} else { //* fallback - postfix < 2.9
 			$content = rf($config_dir.'/master.cf');

install/lib/installer_base.lib.php

@@ -1145,7 +1145,8 @@ public function configure_dovecot() {
 		$config_dir = $conf['postfix']['config_dir'];
 		//* Configure master.cf and add a line for deliver
 		if ($this->postfix_master()) {
-			exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
+			exec ("postconf -M dovecot.unix", $out, $ret); //* Postfix 2.9
+			if (!isset($out[0])) exec ("postconf -M dovecot/unix", $out, $ret); //* Postfix >= 2.11
 			$add_dovecot_service = @($out[0]=='')?true:false;
  		} else { //* fallback - postfix < 2.9
 			$content = rf($config_dir.'/master.cf');