Skip to content

Commit ea30e1c

Browse files
author
Till Brehm
committed
Fixed postconf warnings in installer.
1 parent f652c59 commit ea30e1c

5 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎install/dist/lib/centos_base.lib.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ public function configure_amavis() {
7171

7272
// Adding amavis-services to the master.cf file if the service does not already exists
7373
if ($this->postfix_master()) {
74-
exec ("postconf -M amavis.unix", $out, $ret);
74+
exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
7575
$add_amavis = @($out[0]=='')?true:false;
7676
unset($out);
77-
exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
77+
exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
7878
$add_amavis_10025 = @($out[0]=='')?true:false;
7979
unset($out);
80-
exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
80+
exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
8181
$add_amavis_10027 = @($out[0]=='')?true:false;
8282
unset($out);
8383
} else { //* fallback - postfix < 2.9

‎install/dist/lib/debian60.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function configure_dovecot()
5353
$config_dir = $conf['postfix']['config_dir'];
5454
//* Configure master.cf and add a line for deliver
5555
if ($this->postfix_master()) {
56-
exec ("postconf -M dovecot.unix", $out, $ret);
56+
exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
5757
$add_dovecot_service = @($out[0]=='')?true:false;
5858
} else { //* fallback - postfix < 2.9
5959
$content = rf($config_dir.'/master.cf');

‎install/dist/lib/fedora.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public function configure_dovecot()
352352
$config_dir = $conf['postfix']['config_dir'];
353353
//* Configure master.cf and add a line for deliver
354354
if ($this->postfix_master()) {
355-
exec ("postconf -M dovecot.unix", $out, $ret);
355+
exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
356356
$add_dovecot_service = @($out[0]=='')?true:false;
357357
} else { //* fallback - postfix < 2.9
358358
$content = rf($config_dir.'/master.cf');
@@ -493,13 +493,13 @@ public function configure_amavis() {
493493

494494
// Adding amavis-services to the master.cf file if the service does not already exists
495495
if ($this->postfix_master()) {
496-
exec ("postconf -M amavis.unix", $out, $ret);
496+
exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
497497
$add_amavis = @($out[0]=='')?true:false;
498498
unset($out);
499-
exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
499+
exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
500500
$add_amavis_10025 = @($out[0]=='')?true:false;
501501
unset($out);
502-
exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
502+
exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
503503
$add_amavis_10027 = @($out[0]=='')?true:false;
504504
unset($out);
505505
} else { //* fallback - postfix < 2.9

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public function configure_dovecot()
273273
$config_dir = $conf['postfix']['config_dir'];
274274
//* Configure master.cf and add a line for deliver
275275
if ($this->postfix_master()) {
276-
exec ("postconf -M dovecot.unix", $out, $ret);
276+
exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
277277
$add_dovecot_service = @($out[0]=='')?true:false;
278278
} else { //* fallback - postfix < 2.9
279279
$content = rf($config_dir.'/master.cf');
@@ -395,13 +395,13 @@ public function configure_amavis()
395395

396396
// Adding amavis-services to the master.cf file if the service does not already exists
397397
if ($this->postfix_master()) {
398-
exec ("postconf -M amavis.unix", $out, $ret);
398+
exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
399399
$add_amavis = @($out[0]=='')?true:false;
400400
unset($out);
401-
exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
401+
exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
402402
$add_amavis_10025 = @($out[0]=='')?true:false;
403403
unset($out);
404-
exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
404+
exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
405405
$add_amavis_10027 = @($out[0]=='')?true:false;
406406
unset($out);
407407
} else { //* fallback - postfix < 2.9

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ function configure_postfix($options = '')
229229
$regex = "/^maildrop unix.*pipe flags=DRhu user=vmail argv=\\/usr\\/bin\\/maildrop -d ".$cf['vmail_username']." \\$\{extension} \\$\{recipient} \\$\{user} \\$\{nexthop} \\$\{sender}/";
230230
$configfile = $config_dir.'/master.cf';
231231
if ($this->postfix_master()) {
232-
exec ("postconf -M maildrop.unix", $out, $ret);
232+
exec ("postconf -M maildrop.unix &> /dev/null", $out, $ret);
233233
$change_maildrop_flags = @(preg_match($regex, $out[0]) && $out[0] !='')?false:true;
234234
} else { //* fallback - postfix < 2.9
235235
$change_maildrop_flags = @(preg_match($regex, $configfile))?false:true;
@@ -367,7 +367,7 @@ public function configure_dovecot()
367367
$config_dir = $conf['postfix']['config_dir'];
368368
//* Configure master.cf and add a line for deliver
369369
if ($this->postfix_master()) {
370-
exec ("postconf -M dovecot.unix", $out, $ret);
370+
exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
371371
$add_dovecot_service = @($out[0]=='')?true:false;
372372
} else { //* fallback - postfix < 2.9
373373
$content = rf($config_dir.'/master.cf');
@@ -503,13 +503,13 @@ public function configure_amavis() {
503503

504504
// Adding amavis-services to the master.cf file if the service does not already exists
505505
if ($this->postfix_master()) {
506-
exec ("postconf -M amavis.unix", $out, $ret);
506+
exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
507507
$add_amavis = @($out[0]=='')?true:false;
508508
unset($out);
509-
exec ("postconf -M 127.0.0.1:10025.inet", $out, $ret);
509+
exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
510510
$add_amavis_10025 = @($out[0]=='')?true:false;
511511
unset($out);
512-
exec ("postconf -M 127.0.0.1:10027.inet", $out, $ret);
512+
exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
513513
$add_amavis_10027 = @($out[0]=='')?true:false;
514514
unset($out);
515515
} else { //* fallback - postfix < 2.9

0 commit comments

Comments
 (0)