Added server_id variable to postfix config file templates.

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

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

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

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

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

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

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