Skip to content

Commit 032b867

Browse files
author
Marius Cramer
committed
Fixed: FS#3555 - dovecot-sql.conf: add server_id
1 parent 0b786c8 commit 032b867

File tree

8 files changed

+12
-8
lines changed

8 files changed

+12
-8
lines changed

‎install/dist/lib/debian60.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public function configure_dovecot()
111111
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
112112
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
113113
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
114+
$content = str_replace('{server_id}', $conf['server_id'], $content);
114115
wf($config_dir.'/'.$configfile, $content);
115116

116117
chmod($config_dir.'/'.$configfile, 0600);

‎install/dist/lib/fedora.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ public function configure_dovecot()
450450
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
451451
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
452452
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
453+
$content = str_replace('{server_id}', $conf['server_id'], $content);
453454
wf("$config_dir/$configfile", $content);
454455

455456
exec("chmod 600 $config_dir/$configfile");

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ public function configure_dovecot()
499499
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
500500
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
501501
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
502+
$content = str_replace('{server_id}', $conf['server_id'], $content);
502503
wf("$config_dir/$configfile", $content);
503504

504505
exec("chmod 600 $config_dir/$configfile");

‎install/lib/installer_base.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,7 @@ public function configure_dovecot() {
10151015
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
10161016
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
10171017
$content = str_replace('{mysql_server_host}', $conf['mysql']['host'], $content);
1018+
$content = str_replace('{server_id}', $conf['server_id'], $content);
10181019
wf($config_dir.'/'.$configfile, $content);
10191020

10201021
chmod($config_dir.'/'.$configfile, 0600);

‎install/tpl/debian6_dovecot-sql.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ driver = mysql
1313
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
1414
default_pass_scheme = CRYPT
1515

16-
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
17-
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND `disable%Ls` = 'n'
16+
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n' AND server_id = '{server_id}'
17+
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND `disable%Ls` = 'n' AND server_id = '{server_id}'
1818

1919
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
2020
# Do not enable it on Dovecot 1.x servers

‎install/tpl/debian_dovecot-sql.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ driver = mysql
120120
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
121121
default_pass_scheme = CRYPT
122122

123-
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
124-
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
123+
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n' AND server_id = '{server_id}'
124+
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n' AND server_id = '{server_id}'
125125

126126
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
127127
# Do not enable it on Dovecot 1.x servers

‎install/tpl/fedora_dovecot-sql.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ driver = mysql
133133
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
134134
default_pass_scheme = CRYPT
135135

136-
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
137-
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND `disable%Ls` = 'n'
136+
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n' AND server_id = '{server_id}'
137+
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND `disable%Ls` = 'n' AND server_id = '{server_id}'
138138

139139
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
140140
# Do not enable it on Dovecot 1.x servers

‎install/tpl/opensuse_dovecot-sql.conf.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ driver = mysql
133133
connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password}
134134
default_pass_scheme = CRYPT
135135

136-
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n'
137-
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND `disable%Ls` = 'n'
136+
password_query = SELECT password FROM mail_user WHERE (login = '%u' OR email = '%u') AND disable%Ls = 'n' AND server_id = '{server_id}'
137+
user_query = SELECT email as user, maildir as home, CONCAT('maildir:', maildir, '/Maildir') as mail, uid, gid, CONCAT('*:storage=', quota, 'B') AS quota_rule, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE (login = '%u' OR email = '%u') AND `disable%Ls` = 'n' AND server_id = '{server_id}'
138138

139139
# The iterate_query is required for the doveadm command only and works only on dovecot 2 servers.
140140
# Do not enable it on Dovecot 1.x servers

0 commit comments

Comments
 (0)