From 374226ae8d8c90954df425fc029b10f4e05d709e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 08 Jul 2015 10:42:16 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/lib/installer_base.lib.php | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 49545c8..2ddea5e 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -999,6 +999,8 @@
global $conf;
$virtual_transport = 'dovecot';
+
+ $configure_lmtp = false;
// check if virtual_transport must be changed
if ($this->is_update) {
@@ -1008,6 +1010,7 @@
if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+ $configure_lmtp = true;
}
}
@@ -1078,6 +1081,11 @@
}
}
+ //* dovecot-lmtpd
+ if($configure_lmtp) {
+ replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+ }
+
//* dovecot-sql.conf
$configfile = 'dovecot-sql.conf';
if(is_file($config_dir.'/'.$configfile)) {
--
Gitblit v1.9.1