From f60d97f4313b78f7e605ef65a508d1dee4a2dc25 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Thu, 10 Oct 2019 11:20:30 -0600
Subject: [PATCH] enable managesieve daemon if installed (#3395)
---
install/dist/lib/debian60.lib.php | 11 ++++++++++-
install/lib/installer_base.lib.php | 11 ++++++++++-
install/tpl/debian6_dovecot2.conf.master | 2 ++
install/tpl/debian_dovecot2.conf.master | 2 ++
install/tpl/fedora_dovecot2.conf.master | 2 ++
install/tpl/opensuse_dovecot2.conf.master | 2 ++
6 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
index cc234f132e..cd3b46e544 100644
--- a/install/dist/lib/debian60.lib.php
+++ b/install/dist/lib/debian60.lib.php
@@ -138,7 +138,7 @@ class installer extends installer_base {
}
//remove #2.3+ comment
$content = file_get_contents($config_dir.'/'.$configfile);
- $content = str_replace('#2.3+','',$content);
+ $content = str_replace('#2.3+ ','',$content);
file_put_contents($config_dir.'/'.$configfile,$content);
unset($content);
@@ -155,6 +155,15 @@ 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-lmtpd
if($configure_lmtp) {
replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index e5ac1428d8..73995498d3 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1347,7 +1347,7 @@ class installer_base {
}
//remove #2.3+ comment
$content = file_get_contents($config_dir.'/'.$configfile);
- $content = str_replace('#2.3+','',$content);
+ $content = str_replace('#2.3+ ','',$content);
file_put_contents($config_dir.'/'.$configfile,$content);
unset($content);
@@ -1358,6 +1358,15 @@ 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-lmtpd
if($configure_lmtp) {
replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
diff --git a/install/tpl/debian6_dovecot2.conf.master b/install/tpl/debian6_dovecot2.conf.master
index 1f51f23ad3..c21ab94ad9 100644
--- a/install/tpl/debian6_dovecot2.conf.master
+++ b/install/tpl/debian6_dovecot2.conf.master
@@ -119,3 +119,5 @@ namespace inbox {
special_use = \Trash
}
}
+
+#managesieve+ protocols = $protocols sieve
diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
index b71ede7534..8a204e7776 100644
--- a/install/tpl/debian_dovecot2.conf.master
+++ b/install/tpl/debian_dovecot2.conf.master
@@ -96,3 +96,5 @@ plugin {
quota_status_nouser = DUNNO
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 9115404d9f..207983f86e 100644
--- a/install/tpl/fedora_dovecot2.conf.master
+++ b/install/tpl/fedora_dovecot2.conf.master
@@ -114,3 +114,5 @@ namespace inbox {
special_use = \Trash
}
}
+
+#managesieve+ protocols = $protocols sieve
diff --git a/install/tpl/opensuse_dovecot2.conf.master b/install/tpl/opensuse_dovecot2.conf.master
index 7fb51246f9..42230ed300 100644
--- a/install/tpl/opensuse_dovecot2.conf.master
+++ b/install/tpl/opensuse_dovecot2.conf.master
@@ -113,3 +113,5 @@ namespace inbox {
special_use = \Trash
}
}
+
+#managesieve+ protocols = $protocols sieve
--
GitLab