From 9c6782b8ca5c72218790ac6c18fcb10c83124756 Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Fri, 12 Feb 2016 16:43:30 +0100 Subject: [PATCH] updated installer for postfix-services for postfix >= 2.11 --- install/dist/lib/centos_base.lib.php | 19 ++------- install/dist/lib/debian60.lib.php | 13 +----- install/dist/lib/fedora.lib.php | 32 +++------------ install/dist/lib/gentoo.lib.php | 32 +++------------ install/dist/lib/opensuse.lib.php | 36 ++++------------ install/lib/installer_base.lib.php | 61 +++++++++++++--------------- 6 files changed, 53 insertions(+), 140 deletions(-) diff --git a/install/dist/lib/centos_base.lib.php b/install/dist/lib/centos_base.lib.php index 15074d474a..74ff8be41b 100644 --- a/install/dist/lib/centos_base.lib.php +++ b/install/dist/lib/centos_base.lib.php @@ -70,22 +70,9 @@ class installer_centos extends installer_dist { $config_dir = $conf['postfix']['config_dir']; // Adding amavis-services to the master.cf file if the service does not already exists - if ($this->postfix_master()) { - 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 &> /dev/null", $out, $ret); - $add_amavis_10025 = @($out[0]=='')?true:false; - unset($out); - 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 - $content = rf($conf['postfix']['config_dir'].'/master.cf'); - $add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false; - $add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false; - $add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false; - } + $add_amavis = !$this->get_postfix_service('amavis','unix'); + $add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet'); + $add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet'); if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) { //* backup master.cf diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php index 000324805a..dad45690eb 100644 --- a/install/dist/lib/debian60.lib.php +++ b/install/dist/lib/debian60.lib.php @@ -51,16 +51,7 @@ class installer extends installer_base { } $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); //* 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; - } - if($add_dovecot_service) { + if(!$this->get_postfix_service('dovecot', 'unix')) { //* backup if(is_file($config_dir.'/master.cf')){ copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); @@ -70,7 +61,7 @@ class installer extends installer_base { } //* Configure master.cf and add a line for deliver $content = rf($conf["postfix"]["config_dir"].'/master.cf'); - $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; + $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n"; af($config_dir.'/master.cf', $deliver_content); unset($content); unset($deliver_content); diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index fb12db9c95..d65ac801fe 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -350,16 +350,9 @@ class installer_dist extends installer_base { } $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); //* 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; - } - if($add_dovecot_service) { + if(!$this->get_postfix_service('dovecot', 'unix')) { //* backup if(is_file($config_dir.'/master.cf')){ copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); @@ -369,7 +362,7 @@ class installer_dist extends installer_base { } //* Configure master.cf and add a line for deliver $content = rf($conf["postfix"]["config_dir"].'/master.cf'); - $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; + $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n"; af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content); unset($content); unset($deliver_content); @@ -493,22 +486,9 @@ class installer_dist extends installer_base { $config_dir = $conf['postfix']['config_dir']; // Adding amavis-services to the master.cf file if the service does not already exists - if ($this->postfix_master()) { - 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 &> /dev/null", $out, $ret); - $add_amavis_10025 = @($out[0]=='')?true:false; - unset($out); - 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 - $content = rf($conf['postfix']['config_dir'].'/master.cf'); - $add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false; - $add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false; - $add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false; - } + $add_amavis = !$this->get_postfix_service('amavis','unix'); + $add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet'); + $add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet'); if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) { //* backup master.cf diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 6e676985b2..4080bed16f 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -271,16 +271,9 @@ class installer extends installer_base } $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); //* 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; - } - if($add_dovecot_service) { + if(!$this->get_postfix_service('dovecot', 'unix')) { //* backup if(is_file($config_dir.'/master.cf')){ copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); @@ -290,7 +283,7 @@ class installer extends installer_base } //* Configure master.cf and add a line for deliver $content = rf($conf["postfix"]["config_dir"].'/master.cf'); - $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; + $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n"; af($config_dir.'/master.cf', $deliver_content); unset($content); unset($deliver_content); @@ -395,22 +388,9 @@ class installer extends installer_base $config_dir = $conf['postfix']['config_dir']; // Adding amavis-services to the master.cf file if the service does not already exists - if ($this->postfix_master()) { - 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 &> /dev/null", $out, $ret); - $add_amavis_10025 = @($out[0]=='')?true:false; - unset($out); - 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 - $content = rf($conf['postfix']['config_dir'].'/master.cf'); - $add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false; - $add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false; - $add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false; - } + $add_amavis = !$this->get_postfix_service('amavis','unix'); + $add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet'); + $add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet'); if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) { //* backup master.cf diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 612d41536f..4613a58fd1 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -228,10 +228,10 @@ class installer_dist extends installer_base { //* Check maildrop service in posfix master.cf $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()) { + if($this->get_postfix_service('maildrop', 'unix')) { 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 + } else { $change_maildrop_flags = @(preg_match($regex, $configfile))?false:true; } if ($change_maildrop_flags) { @@ -365,16 +365,9 @@ class installer_dist extends installer_base { } $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); //* 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; - } - if($add_dovecot_service) { + if(!$this->get_postfix_service('dovecot', 'unix')) { //* backup if(is_file($config_dir.'/master.cf')){ copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); @@ -384,7 +377,7 @@ class installer_dist extends installer_base { } //* Configure master.cf and add a line for deliver $content = rf($conf["postfix"]["config_dir"].'/master.cf'); - $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; + $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n"; af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content); unset($content); unset($deliver_content); @@ -503,22 +496,9 @@ class installer_dist extends installer_base { $config_dir = $conf['postfix']['config_dir']; // Adding amavis-services to the master.cf file if the service does not already exists - if ($this->postfix_master()) { - 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 &> /dev/null", $out, $ret); - $add_amavis_10025 = @($out[0]=='')?true:false; - unset($out); - 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 - $content = rf($conf['postfix']['config_dir'].'/master.cf'); - $add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false; - $add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false; - $add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false; - } + $add_amavis = !$this->get_postfix_service('amavis','unix'); + $add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet'); + $add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet'); if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) { //* backup master.cf diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 9c938ef6b1..f2b7041029 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -793,10 +793,25 @@ class installer_base { exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman'); } - //* with postfix >= 2.9 we can detect configured services with postconf - public function postfix_master() { - exec("postconf -M", $out, $ret); - return $ret===0?true:false; + public function get_postfix_service($service, $type) { + global $conf; + + exec("postconf -M", $out, $ret); + + if ($ret === 0) { //* with postfix >= 2.9 we can detect configured services with postconf + unset($out); + exec ("postconf -M $service/$type 2> /dev/null", $out, $ret); //* Postfix >= 2.11 + if (!isset($out[0])) { //* try Postfix 2.9 + exec ("postconf -M $service.$type 2> /dev/null", $out, $ret); + } + $postfix_service = @($out[0]=='')?false:true; + } else { //* fallback - Postfix < 2.9 + rf($conf['postfix']['config_dir'].'/master.cf'); + $regex = '/[^#]'.$service.'.*.'.$type.'.*/'; + $postfix_service = @(!preg_match($regex, $content))?true:false; + } + + return $postfix_service; } public function configure_postfix($options = '') { @@ -988,10 +1003,10 @@ class installer_base { //* Check maildrop service in posfix master.cf $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()) { + if($this->get_postfix_service('maildrop', 'unix')) { 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 + } else { $change_maildrop_flags = @(preg_match($regex, $configfile))?false:true; } if ($change_maildrop_flags) { @@ -1167,16 +1182,9 @@ class installer_base { } $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); //* 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; - } - if($add_dovecot_service) { + if(!$this->get_postfix_service('dovecot', 'unix')) { //* backup if(is_file($config_dir.'/master.cf')){ copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); @@ -1186,7 +1194,7 @@ class installer_base { } //* Configure master.cf and add a line for deliver $content = rf($conf["postfix"]["config_dir"].'/master.cf'); - $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'; + $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n"; af($config_dir.'/master.cf', $deliver_content); unset($content); unset($deliver_content); @@ -1308,25 +1316,12 @@ class installer_base { caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } - $config_dir = $conf['postfix']; + $config_dir = $conf['postfix']['config_dir']; // Adding amavis-services to the master.cf file if the service does not already exists - if ($this->postfix_master()) { - 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 &> /dev/null", $out, $ret); - $add_amavis_10025 = @($out[0]=='')?true:false; - unset($out); - 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 - $content = rf($conf['postfix']['config_dir'].'/master.cf'); - $add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false; - $add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false; - $add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false; - } + $add_amavis = !$this->get_postfix_service('amavis','unix'); + $add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet'); + $add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet'); if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) { //* backup master.cf -- GitLab