From beb9ced0191a9c6804332bd741ba30d4eee0040a Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 22 Jan 2013 14:56:59 -0200 Subject: Major refactor --- templates/postfix/firma/transport_regexp.erb | 2 -- templates/postfix/firma/virtual_regexp.erb | 1 - templates/postfix/mlmmj/transport_regexp.erb | 0 templates/postfix/mlmmj/virtual_regexp.erb | 1 - .../postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf.erb | 5 ----- .../postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf.erb | 5 ----- templates/postfix/sql/mysql_virtual_alias_domain_maps.cf.erb | 5 ----- templates/postfix/sql/mysql_virtual_alias_maps.cf.erb | 6 ------ templates/postfix/sql/mysql_virtual_domains_maps.cf.erb | 9 --------- templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb | 5 ----- templates/postfix/sql/mysql_virtual_mailbox_maps.cf.erb | 6 ------ templates/postfix/sympa/transport_regexp.erb | 2 -- templates/postfix/sympa/virtual_regexp.erb | 1 - 13 files changed, 48 deletions(-) delete mode 100644 templates/postfix/firma/transport_regexp.erb delete mode 100644 templates/postfix/firma/virtual_regexp.erb delete mode 100644 templates/postfix/mlmmj/transport_regexp.erb delete mode 100644 templates/postfix/mlmmj/virtual_regexp.erb delete mode 100644 templates/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf.erb delete mode 100644 templates/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf.erb delete mode 100644 templates/postfix/sql/mysql_virtual_alias_domain_maps.cf.erb delete mode 100644 templates/postfix/sql/mysql_virtual_alias_maps.cf.erb delete mode 100644 templates/postfix/sql/mysql_virtual_domains_maps.cf.erb delete mode 100644 templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb delete mode 100644 templates/postfix/sql/mysql_virtual_mailbox_maps.cf.erb delete mode 100644 templates/postfix/sympa/transport_regexp.erb delete mode 100644 templates/postfix/sympa/virtual_regexp.erb (limited to 'templates/postfix') diff --git a/templates/postfix/firma/transport_regexp.erb b/templates/postfix/firma/transport_regexp.erb deleted file mode 100644 index 27c65af..0000000 --- a/templates/postfix/firma/transport_regexp.erb +++ /dev/null @@ -1,2 +0,0 @@ -/^.*+request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest: -/^.*\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ firma: diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/postfix/firma/virtual_regexp.erb deleted file mode 100644 index 767f3c1..0000000 --- a/templates/postfix/firma/virtual_regexp.erb +++ /dev/null @@ -1 +0,0 @@ -/^(.*)-request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ $1+request@<%= subdomain %>.$2 diff --git a/templates/postfix/mlmmj/transport_regexp.erb b/templates/postfix/mlmmj/transport_regexp.erb deleted file mode 100644 index e69de29..0000000 diff --git a/templates/postfix/mlmmj/virtual_regexp.erb b/templates/postfix/mlmmj/virtual_regexp.erb deleted file mode 100644 index 57f1a72..0000000 --- a/templates/postfix/mlmmj/virtual_regexp.erb +++ /dev/null @@ -1 +0,0 @@ -/^(.*)\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ ${1} diff --git a/templates/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf.erb b/templates/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf.erb deleted file mode 100644 index dd41a61..0000000 --- a/templates/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf.erb +++ /dev/null @@ -1,5 +0,0 @@ -user = <%= database_user %> -password = <%= database_password %> -hosts = <%= database_host %> -dbname = <%= database_name %> -query = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('@', alias_domain.target_domain) AND alias.active = 1 AND alias_domain.active='1' diff --git a/templates/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf.erb b/templates/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf.erb deleted file mode 100644 index c148372..0000000 --- a/templates/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf.erb +++ /dev/null @@ -1,5 +0,0 @@ -user = <%= database_user %> -password = <%= database_password %> -hosts = <%= database_host %> -dbname = <%= database_name %> -query = SELECT maildir FROM mailbox,alias_domain WHERE alias_domain.alias_domain = '%d' and mailbox.username = CONCAT('%u', '@', alias_domain.target_domain) AND mailbox.active = 1 AND alias_domain.active='1' diff --git a/templates/postfix/sql/mysql_virtual_alias_domain_maps.cf.erb b/templates/postfix/sql/mysql_virtual_alias_domain_maps.cf.erb deleted file mode 100644 index fddfe91..0000000 --- a/templates/postfix/sql/mysql_virtual_alias_domain_maps.cf.erb +++ /dev/null @@ -1,5 +0,0 @@ -user = <%= database_user %> -password = <%= database_password %> -hosts = <%= database_host %> -dbname = <%= database_name %> -query = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('%u', '@', alias_domain.target_domain) AND alias.active = 1 AND alias_domain.active='1' diff --git a/templates/postfix/sql/mysql_virtual_alias_maps.cf.erb b/templates/postfix/sql/mysql_virtual_alias_maps.cf.erb deleted file mode 100644 index d4b7164..0000000 --- a/templates/postfix/sql/mysql_virtual_alias_maps.cf.erb +++ /dev/null @@ -1,6 +0,0 @@ -user = <%= database_user %> -password = <%= database_password %> -hosts = <%= database_host %> -dbname = <%= database_name %> -query = SELECT goto FROM alias WHERE address='%s' AND active = '1' -#expansion_limit = 100 diff --git a/templates/postfix/sql/mysql_virtual_domains_maps.cf.erb b/templates/postfix/sql/mysql_virtual_domains_maps.cf.erb deleted file mode 100644 index ecf253e..0000000 --- a/templates/postfix/sql/mysql_virtual_domains_maps.cf.erb +++ /dev/null @@ -1,9 +0,0 @@ -user = <%= database_user %> -password = <%= database_password %> -hosts = <%= database_host %> -dbname = <%= database_name %> -query = SELECT domain FROM domain WHERE domain='%s' AND active = '1' -#query = SELECT domain FROM domain WHERE domain='%s' -#optional query to use when relaying for backup MX -#query = SELECT domain FROM domain WHERE domain='%s' AND backupmx = '0' AND active = '1' -#expansion_limit = 100 diff --git a/templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb b/templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb deleted file mode 100644 index b40ce8f..0000000 --- a/templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb +++ /dev/null @@ -1,5 +0,0 @@ -user = <%= database_user %> -password = <%= database_password %> -hosts = <%= database_host %> -dbname = <%= database_name %> -query = SELECT quota FROM mailbox WHERE username='%s' AND active = '1' diff --git a/templates/postfix/sql/mysql_virtual_mailbox_maps.cf.erb b/templates/postfix/sql/mysql_virtual_mailbox_maps.cf.erb deleted file mode 100644 index 4e4b54e..0000000 --- a/templates/postfix/sql/mysql_virtual_mailbox_maps.cf.erb +++ /dev/null @@ -1,6 +0,0 @@ -user = <%= database_user %> -password = <%= database_password %> -hosts = <%= database_host %> -dbname = <%= database_name %> -query = SELECT maildir FROM mailbox WHERE username='%s' AND active = '1' -#expansion_limit = 100 diff --git a/templates/postfix/sympa/transport_regexp.erb b/templates/postfix/sympa/transport_regexp.erb deleted file mode 100644 index 1e32e2a..0000000 --- a/templates/postfix/sympa/transport_regexp.erb +++ /dev/null @@ -1,2 +0,0 @@ -/^.*+owner\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ sympabounce: -/^.*\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ sympa: diff --git a/templates/postfix/sympa/virtual_regexp.erb b/templates/postfix/sympa/virtual_regexp.erb deleted file mode 100644 index f5883d7..0000000 --- a/templates/postfix/sympa/virtual_regexp.erb +++ /dev/null @@ -1 +0,0 @@ -/^(.*)-owner\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ $1+owner@<%= subdomain %>.$2 -- cgit v1.2.3