Fixed: FS#1183 - remove server_id part from conditional stamenet in postfix...

tbrehm

2010-05-26 d3824e3a2ad71aa01a0e0895199cdefa798337bd

Fixed: FS#1183 - remove server_id part from conditional stamenet in postfix and courier / dovecot queries.

 install/tpl/mysql-virtual_domains.cf.master

@@ -4,5 +4,5 @@
table = mail_domain
select_field = domain
where_field = domain
additional_conditions = and active = 'y' and server_id = {server_id}
additional_conditions = and active = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_email2email.cf.master

@@ -4,5 +4,5 @@
table = mail_user
select_field = email
where_field = email
additional_conditions = and postfix = 'y' and server_id = {server_id}
additional_conditions = and postfix = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_forwardings.cf.master

@@ -4,5 +4,5 @@
table = mail_forwarding
select_field = destination
where_field = source
additional_conditions = and active = 'y' and server_id = {server_id}
additional_conditions = and active = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_mailboxes.cf.master

@@ -4,5 +4,5 @@
table = mail_user
select_field = CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/')
where_field = email
additional_conditions = and postfix = 'y' and server_id = {server_id}
additional_conditions = and postfix = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_recipient.cf.master

@@ -4,5 +4,5 @@
table        = mail_access
select_field = access
where_field  = source
additional_conditions = and type = 'recipient' and active = 'y' and server_id = {server_id}
additional_conditions = and type = 'recipient' and active = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_relaydomains.cf.master

@@ -4,5 +4,5 @@
table = mail_transport
select_field = domain
where_field = domain
additional_conditions = and active = 'y' and server_id = {server_id}
additional_conditions = and active = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_relayrecipientmaps.cf.master

@@ -4,5 +4,5 @@
table = mail_relay_recipient
select_field = access
where_field = source
additional_conditions = and active = 'y' and server_id = {server_id}
additional_conditions = and active = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_sender.cf.master

@@ -4,5 +4,5 @@
table        = mail_access
select_field = access
where_field  = source
additional_conditions = and type = 'sender' and active = 'y' and server_id = {server_id}
additional_conditions = and type = 'sender' and active = 'y'
hosts = {mysql_server_ip}

 install/tpl/mysql-virtual_transports.cf.master

@@ -4,5 +4,5 @@
table = mail_transport
select_field = transport
where_field = domain
additional_conditions = and active = 'y' and server_id = {server_id}
additional_conditions = and active = 'y'
hosts = {mysql_server_ip}