Refactoring for 2.7 compatibility

12 files changed, 35 insertions, 35 deletions

diff --git a/templates/postfix/firma/transport_regexp.erb b/templates/postfix/firma/transport_regexp.erb
index a15fc5a..27c65af 100644
--- a/templates/postfix/firma/transport_regexp.erb
+++ b/templates/postfix/firma/transport_regexp.erb
@@ -1,2 +1,2 @@
-/^.*+request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest:
-/^.*\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/       firma:
+/^.*+request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ firmarequest:
+/^.*\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/       firma:
diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/postfix/firma/virtual_regexp.erb
index 7ba1b16..767f3c1 100644
--- a/templates/postfix/firma/virtual_regexp.erb
+++ b/templates/postfix/firma/virtual_regexp.erb
@@ -1 +1 @@
-/^(.*)-request\@<%= firma_subdomain.gsub(/\./, '\.') %>\.(.*)$/    $1+request@<%= firma_subdomain %>.$2
+/^(.*)-request\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/    $1+request@<%= subdomain %>.$2
diff --git a/templates/postfix/mlmmj/virtual_regexp.erb b/templates/postfix/mlmmj/virtual_regexp.erb
index 77811dd..57f1a72 100644
--- a/templates/postfix/mlmmj/virtual_regexp.erb
+++ b/templates/postfix/mlmmj/virtual_regexp.erb
@@ -1 +1 @@
-/^(.*)\@<%= mlmmj_subdomain.gsub(/\./, '\.') %>\.(.*)$/                    ${1}
+/^(.*)\@<%= 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
index 9fa4867..dd41a61 100644
--- a/templates/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf.erb
+++ b/templates/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf.erb
@@ -1,5 +1,5 @@
-user      = <%= postfixadmin_database_user %>
-password  = <%= postfixadmin_database_password %>
-hosts     = <%= postfixadmin_database_host %>
-dbname    = <%= postfixadmin_database_name %>
+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
index b7aabf2..c148372 100644
--- a/templates/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf.erb
+++ b/templates/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf.erb
@@ -1,5 +1,5 @@
-user      = <%= postfixadmin_database_user %>
-password  = <%= postfixadmin_database_password %>
-hosts     = <%= postfixadmin_database_host %>
-dbname    = <%= postfixadmin_database_name %>
+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
index ac120c0..fddfe91 100644
--- a/templates/postfix/sql/mysql_virtual_alias_domain_maps.cf.erb
+++ b/templates/postfix/sql/mysql_virtual_alias_domain_maps.cf.erb
@@ -1,5 +1,5 @@
-user      = <%= postfixadmin_database_user %>
-password  = <%= postfixadmin_database_password %>
-hosts     = <%= postfixadmin_database_host %>
-dbname    = <%= postfixadmin_database_name %>
+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
index f80c6fc..d4b7164 100644
--- a/templates/postfix/sql/mysql_virtual_alias_maps.cf.erb
+++ b/templates/postfix/sql/mysql_virtual_alias_maps.cf.erb
@@ -1,6 +1,6 @@
-user      = <%= postfixadmin_database_user %>
-password  = <%= postfixadmin_database_password %>
-hosts     = <%= postfixadmin_database_host %>
-dbname    = <%= postfixadmin_database_name %>
+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
index 0706f4b..ecf253e 100644
--- a/templates/postfix/sql/mysql_virtual_domains_maps.cf.erb
+++ b/templates/postfix/sql/mysql_virtual_domains_maps.cf.erb
@@ -1,7 +1,7 @@
-user      = <%= postfixadmin_database_user %>
-password  = <%= postfixadmin_database_password %>
-hosts     = <%= postfixadmin_database_host %>
-dbname    = <%= postfixadmin_database_name %>
+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
diff --git a/templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb b/templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb
index 61804f3..b40ce8f 100644
--- a/templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb
+++ b/templates/postfix/sql/mysql_virtual_mailbox_limit_maps.cf.erb
@@ -1,5 +1,5 @@
-user      = <%= postfixadmin_database_user %>
-password  = <%= postfixadmin_database_password %>
-hosts     = <%= postfixadmin_database_host %>
-dbname    = <%= postfixadmin_database_name %>
+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
index f52049b..4e4b54e 100644
--- a/templates/postfix/sql/mysql_virtual_mailbox_maps.cf.erb
+++ b/templates/postfix/sql/mysql_virtual_mailbox_maps.cf.erb
@@ -1,6 +1,6 @@
-user      = <%= postfixadmin_database_user %>
-password  = <%= postfixadmin_database_password %>
-hosts     = <%= postfixadmin_database_host %>
-dbname    = <%= postfixadmin_database_name %>
+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
index a7885f7..1e32e2a 100644
--- a/templates/postfix/sympa/transport_regexp.erb
+++ b/templates/postfix/sympa/transport_regexp.erb
@@ -1,2 +1,2 @@
-/^.*+owner\@<%= sympa_subdomain.gsub(/\./, '\.') %>\.(.*)$/ sympabounce:
-/^.*\@<%= sympa_subdomain.gsub(/\./, '\.') %>\.(.*)$/       sympa:
+/^.*+owner\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/ sympabounce:
+/^.*\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/       sympa:
diff --git a/templates/postfix/sympa/virtual_regexp.erb b/templates/postfix/sympa/virtual_regexp.erb
index a2ab261..f5883d7 100644
--- a/templates/postfix/sympa/virtual_regexp.erb
+++ b/templates/postfix/sympa/virtual_regexp.erb
@@ -1 +1 @@
-/^(.*)-owner\@<%= sympa_subdomain.gsub(/\./, '\.') %>\.(.*)$/    $1+owner@<%= sympa_subdomain %>.$2
+/^(.*)-owner\@<%= subdomain.gsub(/\./, '\.') %>\.(.*)$/    $1+owner@<%= subdomain %>.$2