From 5d45b76998bfc6982e54aba6daee8478f19e536b Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 09 Feb 2016 16:08:07 -0500
Subject: [PATCH] fixed installer - ispconfig/ispconfig3#3750
---
install/lib/installer_base.lib.php | 3 ++-
install/dist/lib/fedora.lib.php | 3 ++-
install/dist/lib/gentoo.lib.php | 3 ++-
install/dist/lib/opensuse.lib.php | 3 ++-
install/dist/lib/debian60.lib.php | 5 +++--
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index b5495fa..0003248 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -53,8 +53,9 @@
$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;
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index b8ce46a..fb12db9 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -352,7 +352,8 @@
$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');
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index e15368b..970d83a 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -273,7 +273,8 @@
$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');
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 60e3858..612d415 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -367,7 +367,8 @@
$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');
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 2ca0e54..2522971 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1145,7 +1145,8 @@
$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');
--
Gitblit v1.9.1