From f652c5901e8230fd53bcd5f57ccd6ae69dc2b2ca Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sat, 02 Jan 2016 07:34:58 -0500
Subject: [PATCH] Fixed postconf warnings in installer.
---
install/lib/installer_base.lib.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index fcbab59..db83e05 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -875,7 +875,7 @@
$regex = "/^maildrop unix.*pipe flags=DRhu user=vmail argv=\\/usr\\/bin\\/maildrop -d ".$cf['vmail_username']." \\$\{extension} \\$\{recipient} \\$\{user} \\$\{nexthop} \\$\{sender}/";
$configfile = $config_dir.'/master.cf';
if ($this->postfix_master()) {
- exec ("postconf -M maildrop.unix", $out, $ret);
+ exec ("postconf -M maildrop.unix &> /dev/null", $out, $ret);
$change_maildrop_flags = @(preg_match($regex, $out[0]) && $out[0] !='')?false:true;
} else { //* fallback - postfix < 2.9
$change_maildrop_flags = @(preg_match($regex, $configfile))?false:true;
@@ -1055,7 +1055,7 @@
$config_dir = $conf['postfix']['config_dir'];
//* Configure master.cf and add a line for deliver
if ($this->postfix_master()) {
- exec ("postconf -M dovecot.unix", $out, $ret);
+ exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
$add_dovecot_service = @($out[0]=='')?true:false;
} else { //* fallback - postfix < 2.9
$content = rf($config_dir.'/master.cf');
@@ -1197,13 +1197,13 @@
// Adding amavis-services to the master.cf file if the service does not already exists
if ($this->postfix_master()) {
- exec ("postconf -M amavis.unix", $out, $ret);
+ exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
$add_amavis = @($out[0]=='')?true:false;
unset($out);
- exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
+ exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
$add_amavis_10025 = @($out[0]=='')?true:false;
unset($out);
- exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
+ exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
$add_amavis_10027 = @($out[0]=='')?true:false;
unset($out);
} else { //* fallback - postfix < 2.9
--
Gitblit v1.9.1