From 812da3d9a130d367a727a5c00e66da11e0259a70 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Wed, 25 May 2016 06:58:45 -0400
Subject: [PATCH] dovecot2 - enable iterate_query
---
install/dist/lib/fedora.lib.php | 4 ++++
install/dist/lib/gentoo.lib.php | 4 ++++
install/dist/lib/opensuse.lib.php | 4 ++++
install/lib/installer_base.lib.php | 4 ++++
install/tpl/debian6_dovecot-sql.conf.master | 2 +-
install/tpl/debian_dovecot-sql.conf.master | 2 +-
install/tpl/debian_dovecot2.conf.master | 1 +
install/tpl/fedora_dovecot-sql.conf.master | 2 +-
install/tpl/fedora_dovecot2.conf.master | 1 +
install/tpl/opensuse_dovecot-sql.conf.master | 2 +-
install/tpl/opensuse_dovecot2.conf.master | 1 +
11 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 84196bfef1..950b60be80 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -461,6 +461,10 @@ class installer_dist extends installer_base {
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
$content = str_replace('{server_id}', $conf['server_id'], $content);
+ # enable iteratq_query for dovecot2
+ if(version_compare($dovecot_version,2, '>=')) {
+ $content = str_replace('# iterate_query', 'iterate_query', $content);
+ }
wf("$config_dir/$configfile", $content);
exec("chmod 600 $config_dir/$configfile");
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index c4abd883d8..19899c1791 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -341,6 +341,10 @@ class installer extends installer_base
//* dovecot-sql.conf
$configfile = $config_dir.'/dovecot-sql.conf';
$content = $this->get_template_file('debian_dovecot-sql.conf', true, true);
+ # enable iteratq_query for dovecot2
+ if(version_compare($dovecot_version,2, '>=')) {
+ $content = str_replace('# iterate_query', 'iterate_query', $content);
+ }
$this->write_config_file($configfile, $content);
}
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index a435972634..4b1f75d098 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -471,6 +471,10 @@ class installer_dist extends installer_base {
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
$content = str_replace('{server_id}', $conf['server_id'], $content);
+ # enable iteratq_query for dovecot2
+ if(version_compare($dovecot_version,2, '>=')) {
+ $content = str_replace('# iterate_query', 'iterate_query', $content);
+ }
wf("$config_dir/$configfile", $content);
exec("chmod 600 $config_dir/$configfile");
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 334a16b10d..3d49861335 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1277,6 +1277,10 @@ class installer_base {
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
$content = str_replace('{server_id}', $conf['server_id'], $content);
+ # enable iteratq_query for dovecot2
+ if(version_compare($dovecot_version,2, '>=')) {
+ $content = str_replace('# iterate_query', 'iterate_query', $content);
+ }
wf($config_dir.'/'.$configfile, $content);
chmod($config_dir.'/'.$configfile, 0600);
diff --git a/install/tpl/debian6_dovecot-sql.conf.master b/install/tpl/debian6_dovecot-sql.conf.master
index 30afc1877a..e05330dc26 100644
--- a/install/tpl/debian6_dovecot-sql.conf.master
+++ b/install/tpl/debian6_dovecot-sql.conf.master
@@ -19,4 +19,4 @@ user_query = SELECT email as user, maildir as home, CONCAT( maildir_format, ':',
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
# Do not enable it on Dovecot 1.x servers
-# iterate_query = SELECT email as user FROM mail_user
+# iterate_query = SELECT email as user FROM mail_user WHERE server_id = '{server_id}'
diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master
index b8919ff790..2e0858057e 100644
--- a/install/tpl/debian_dovecot-sql.conf.master
+++ b/install/tpl/debian_dovecot-sql.conf.master
@@ -126,5 +126,5 @@ user_query = SELECT email as user, maildir as home, CONCAT( maildir_format, ':',
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
# Do not enable it on Dovecot 1.x servers
-# iterate_query = SELECT email as user FROM mail_user
+# iterate_query = SELECT email as user FROM mail_user WHERE server_id = '{server_id}'
diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
index a753433c51..80ca21dd71 100644
--- a/install/tpl/debian_dovecot2.conf.master
+++ b/install/tpl/debian_dovecot2.conf.master
@@ -63,3 +63,4 @@ protocol lmtp {
postmaster_address = webmaster@localhost
mail_plugins = quota sieve
}
+mail_plugins = $mail_plugins quota
diff --git a/install/tpl/fedora_dovecot-sql.conf.master b/install/tpl/fedora_dovecot-sql.conf.master
index d242c8c722..5d06d51e5d 100644
--- a/install/tpl/fedora_dovecot-sql.conf.master
+++ b/install/tpl/fedora_dovecot-sql.conf.master
@@ -139,4 +139,4 @@ user_query = SELECT email as user, maildir as home, CONCAT( maildir_format, ':',
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
# Do not enable it on Dovecot 1.x servers
-# iterate_query = SELECT email as user FROM mail_user
\ No newline at end of file
+# iterate_query = SELECT email as user FROM mail_user WHERE server_id = '{server_id}'
diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master
index a527676b65..c14af1d44d 100644
--- a/install/tpl/fedora_dovecot2.conf.master
+++ b/install/tpl/fedora_dovecot2.conf.master
@@ -61,3 +61,4 @@ protocol lmtp {
postmaster_address = webmaster@localhost
mail_plugins = quota sieve
}
+mail_plugins = $mail_plugins quota
diff --git a/install/tpl/opensuse_dovecot-sql.conf.master b/install/tpl/opensuse_dovecot-sql.conf.master
index f9ffbf7c06..5d06d51e5d 100644
--- a/install/tpl/opensuse_dovecot-sql.conf.master
+++ b/install/tpl/opensuse_dovecot-sql.conf.master
@@ -139,4 +139,4 @@ user_query = SELECT email as user, maildir as home, CONCAT( maildir_format, ':',
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
# Do not enable it on Dovecot 1.x servers
-# iterate_query = SELECT email as user FROM mail_user
+# iterate_query = SELECT email as user FROM mail_user WHERE server_id = '{server_id}'
diff --git a/install/tpl/opensuse_dovecot2.conf.master b/install/tpl/opensuse_dovecot2.conf.master
index 8deb305a4c..f28c1095d2 100644
--- a/install/tpl/opensuse_dovecot2.conf.master
+++ b/install/tpl/opensuse_dovecot2.conf.master
@@ -60,3 +60,4 @@ protocol lmtp {
postmaster_address = webmaster@localhost
mail_plugins = quota sieve
}
+mail_plugins = $mail_plugins quota
--
GitLab