Skip to content

Commit 2c62c9d

Browse files
author
Till Brehm
committed
Merge branch 'mysql-virtual_alias_maps.cf' into 'stable-3.1'
separate mysql-virtual_alias_domains.cf and mysql-virtual_alias_maps.cf See merge request ispconfig/ispconfig3!1091
2 parents af014c1 + 1c7d6d8 commit 2c62c9d

9 files changed

+22
-6
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ function configure_postfix($options = '')
6666
//* mysql-virtual_alias_domains.cf
6767
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
6868

69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6972
//* mysql-virtual_mailboxes.cf
7073
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
7174

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ function configure_postfix($options = '')
6666
//* mysql-virtual_alias_domains.cf
6767
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
6868

69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6972
//* mysql-virtual_mailboxes.cf
7073
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
7174

‎install/lib/installer_base.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,9 @@ public function configure_postfix($options = '') {
976976
//* mysql-virtual_alias_domains.cf
977977
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
978978

979+
//* mysql-virtual_alias_maps.cf
980+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
981+
979982
//* mysql-virtual_mailboxes.cf
980983
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
981984

‎install/tpl/debian_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
22
alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
33
virtual_alias_domains = proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf
4-
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
4+
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_maps.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
55
virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
66
virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
77
virtual_mailbox_base = {vmail_mailbox_base}

‎install/tpl/fedora_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
virtual_alias_domains = proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf
2-
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
2+
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_maps.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
33
virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
44
virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
55
virtual_mailbox_base = {vmail_mailbox_base}

‎install/tpl/gentoo_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
virtual_alias_domains = proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf
2-
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
2+
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_maps.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
33
virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
44
virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
55
virtual_mailbox_base = {vmail_mailbox_base}

‎install/tpl/mysql-virtual_alias_domains.cf.master‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
44
hosts = {mysql_server_ip}
5-
query = SELECT destination FROM mail_forwarding
6-
WHERE source = '@%d' AND type = 'aliasdomain' AND active = 'y' AND server_id = {server_id}
5+
query = SELECT SUBSTRING_INDEX(destination, '@', -1) FROM mail_forwarding
6+
WHERE source = '@%s' AND type = 'aliasdomain' AND active = 'y' AND server_id = {server_id}
7+

‎install/tpl/mysql-virtual_alias_maps.cf.master‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
user = {mysql_server_ispconfig_user}
2+
password = {mysql_server_ispconfig_password}
3+
dbname = {mysql_server_database}
4+
hosts = {mysql_server_ip}
5+
query = SELECT destination FROM mail_forwarding
6+
WHERE source = '@%d' AND type = 'aliasdomain' AND active = 'y' AND server_id = {server_id}

‎install/tpl/opensuse_postfix.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
alias_maps = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
22
alias_database = hash:/etc/aliases, hash:/var/lib/mailman/data/aliases
33
virtual_alias_domains = proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf
4-
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_domains.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
4+
virtual_alias_maps = hash:/var/lib/mailman/data/virtual-mailman, proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, proxy:mysql:{config_dir}/mysql-virtual_alias_maps.cf, proxy:mysql:{config_dir}/mysql-virtual_email2email.cf
55
virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
66
virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
77
virtual_mailbox_base = {vmail_mailbox_base}

0 commit comments

Comments
 (0)