diff --git a/install/tpl/mysql-virtual_domains.cf.master b/install/tpl/mysql-virtual_domains.cf.master index 8cb0d18f95b20557f2fdd5a9c3d9c521b85cb33a..a02febc5e21e4c64c2294a5c77925b41b7879b31 100644 --- a/install/tpl/mysql-virtual_domains.cf.master +++ b/install/tpl/mysql-virtual_domains.cf.master @@ -4,4 +4,5 @@ dbname = {mysql_server_database} table = mail_domain select_field = 'virtual' where_field = domain +additional_conditions = and server_id = {server_id} hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_email2email.cf.master b/install/tpl/mysql-virtual_email2email.cf.master index df3be047630e9ee4c5d28d216487e6a02052937b..db73a628680bf76a8ebc4887e2e7dcfdb6c0df34 100644 --- a/install/tpl/mysql-virtual_email2email.cf.master +++ b/install/tpl/mysql-virtual_email2email.cf.master @@ -4,4 +4,5 @@ dbname = {mysql_server_database} table = mail_user select_field = email where_field = email +additional_conditions = and server_id = {server_id} hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_forwardings.cf.master b/install/tpl/mysql-virtual_forwardings.cf.master index 01281e353cb1e0aed1f6cd1e9426d40bc7399103..b3f3325baec53a8ac870542247fd4cf310f1e311 100644 --- a/install/tpl/mysql-virtual_forwardings.cf.master +++ b/install/tpl/mysql-virtual_forwardings.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_forwarding select_field = destination where_field = source -additional_conditions = and active = 'y' +additional_conditions = and active = 'y' and server_id = {server_id} hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_mailboxes.cf.master b/install/tpl/mysql-virtual_mailboxes.cf.master index 570f069e253870cf2e90400618204d7dc4ff0a4b..d013c34cdc4afb383de7cb6afc70933850923440 100644 --- a/install/tpl/mysql-virtual_mailboxes.cf.master +++ b/install/tpl/mysql-virtual_mailboxes.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_user select_field = CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/') where_field = email -additional_conditions = and postfix = 'y' +additional_conditions = and postfix = 'y' and server_id = {server_id} hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_recipient.cf.master b/install/tpl/mysql-virtual_recipient.cf.master index 254cfe5cbf4b43c81871bb50a863d71326119108..49024f3ebd262cc8929fc947e373b21d5a56fac6 100644 --- a/install/tpl/mysql-virtual_recipient.cf.master +++ b/install/tpl/mysql-virtual_recipient.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_access select_field = access where_field = source -additional_conditions = and type = 'recipient' and active = 'y' +additional_conditions = and type = 'recipient' and active = 'y' and server_id = {server_id} hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_sender.cf.master b/install/tpl/mysql-virtual_sender.cf.master index 7531451277c86665e35e6f8a0ef58eb9bf24d37c..0ef634aec762547e1e92113d3e6be1499c8b9a1a 100644 --- a/install/tpl/mysql-virtual_sender.cf.master +++ b/install/tpl/mysql-virtual_sender.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_access select_field = access where_field = source -additional_conditions = and type = 'sender' and active = 'y' +additional_conditions = and type = 'sender' and active = 'y' and server_id = {server_id} hosts = {mysql_server_ip} \ No newline at end of file diff --git a/install/tpl/mysql-virtual_transports.cf.master b/install/tpl/mysql-virtual_transports.cf.master index 0040d1d4ed9bd5f8399e2525a1857c312e3d4836..048a7a81ac85deec4ae936a74515dc9f5cf2748c 100644 --- a/install/tpl/mysql-virtual_transports.cf.master +++ b/install/tpl/mysql-virtual_transports.cf.master @@ -4,5 +4,5 @@ dbname = {mysql_server_database} table = mail_transport select_field = transport where_field = domain -additional_conditions = and active = 'y' +additional_conditions = and active = 'y' and server_id = {server_id} hosts = {mysql_server_ip} \ No newline at end of file