From 2120766a264199d00580dfcbde98008bfd8e2815 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Mon, 14 Oct 2019 17:53:23 -0600
Subject: [PATCH] use lmtp by default if detected
---
install/dist/lib/debian60.lib.php | 27 ++++++++++++++---------
install/lib/installer_base.lib.php | 27 ++++++++++++++---------
install/tpl/debian6_dovecot2.conf.master | 1 -
install/tpl/debian_dovecot2.conf.master | 1 -
install/tpl/fedora_dovecot2.conf.master | 1 -
install/tpl/opensuse_dovecot2.conf.master | 1 -
6 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index cd3b46e544..faac52b227 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -33,11 +33,16 @@ class installer extends installer_base {
public function configure_dovecot()
{
global $conf;
-
+
$virtual_transport = 'dovecot';
$configure_lmtp = false;
-
+
+ // use lmtp if installed
+ if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+ $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+ }
+
// check if virtual_transport must be changed
if ($this->is_update) {
$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
@@ -155,20 +160,20 @@ class installer extends installer_base {
}
}
- //* dovecot-managesieved
- if($configure_managesieve = is_file('/usr/lib/dovecot/managesieve')) {
- //remove #mangesieve+ comment
- $content = file_get_contents($config_dir.'/'.$configfile);
- $content = str_replace('#mangesieve+ ','',$content);
- file_put_contents($config_dir.'/'.$configfile,$content);
- unset($content);
- }
+ $dovecot_protocols = 'imap pop3';
//* dovecot-lmtpd
if($configure_lmtp) {
- replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+ $dovecot_protocols .= ' lmtp'
+ }
+
+ //* dovecot-managesieved
+ if(is_file('/usr/lib/dovecot/managesieve')) {
+ $dovecot_protocols .= ' sieve'
}
+ replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', "protocols = $dovecot_protocols", 1, 0);
+
//* dovecot-sql.conf
$configfile = 'dovecot-sql.conf';
if(is_file($config_dir.'/'.$configfile)){
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 73995498d3..ee9d1a6d8d 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1233,11 +1233,16 @@ class installer_base {
public function configure_dovecot() {
global $conf;
-
+
$virtual_transport = 'dovecot';
$configure_lmtp = false;
-
+
+ // use lmtp if installed
+ if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+ $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+ }
+
// check if virtual_transport must be changed
if ($this->is_update) {
$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
@@ -1358,20 +1363,20 @@ class installer_base {
}
}
- //* dovecot-managesieved
- if($configure_managesieve = is_file('/usr/lib/dovecot/managesieve')) {
- //remove #mangesieve+ comment
- $content = file_get_contents($config_dir.'/'.$configfile);
- $content = str_replace('#mangesieve+ ','',$content);
- file_put_contents($config_dir.'/'.$configfile,$content);
- unset($content);
- }
+ $dovecot_protocols = 'imap pop3';
//* dovecot-lmtpd
if($configure_lmtp) {
- replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+ $dovecot_protocols .= ' lmtp'
+ }
+
+ //* dovecot-managesieved
+ if(is_file('/usr/lib/dovecot/managesieve')) {
+ $dovecot_protocols .= ' sieve'
}
+ replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', "protocols = $dovecot_protocols", 1, 0);
+
//* dovecot-sql.conf
$configfile = 'dovecot-sql.conf';
if(is_file($config_dir.'/'.$configfile)) {
diff --git a/install/tpl/debian6_dovecot2.conf.master b/install/tpl/debian6_dovecot2.conf.master
index c21ab94ad9..95acb721e0 100644
--- a/install/tpl/debian6_dovecot2.conf.master
+++ b/install/tpl/debian6_dovecot2.conf.master
@@ -120,4 +120,3 @@ namespace inbox {
}
}
-#managesieve+ protocols = $protocols sieve
diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
index 8a204e7776..dbacf872f5 100644
--- a/install/tpl/debian_dovecot2.conf.master
+++ b/install/tpl/debian_dovecot2.conf.master
@@ -97,4 +97,3 @@ plugin {
quota_status_overquota = "552 5.2.2 Mailbox is full"
}
-#managesieve+ protocols = $protocols sieve
diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master
index 207983f86e..08ac94a903 100644
--- a/install/tpl/fedora_dovecot2.conf.master
+++ b/install/tpl/fedora_dovecot2.conf.master
@@ -115,4 +115,3 @@ namespace inbox {
}
}
-#managesieve+ protocols = $protocols sieve
diff --git a/install/tpl/opensuse_dovecot2.conf.master b/install/tpl/opensuse_dovecot2.conf.master
index 42230ed300..6e040b9745 100644
--- a/install/tpl/opensuse_dovecot2.conf.master
+++ b/install/tpl/opensuse_dovecot2.conf.master
@@ -114,4 +114,3 @@ namespace inbox {
}
}
-#managesieve+ protocols = $protocols sieve
--
GitLab