From b0f818efec0b74741d6fa53d0e86a95065d4e2d1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 12 Feb 2016 11:06:36 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/dist/lib/debian60.lib.php | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index b5495fa..dad4569 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -51,15 +51,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 &> /dev/null", $out, $ret);
- $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');
@@ -69,7 +61,7 @@
}
//* 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);
--
Gitblit v1.9.1