Refactoring for 2.7 compatibility

17 files changed, 66 insertions, 66 deletions

diff --git a/templates/dovecot/dovecot-sql.conf.erb b/templates/dovecot/dovecot-sql.conf.erb
index 1ddb76c..2fc0df9 100644
--- a/templates/dovecot/dovecot-sql.conf.erb
+++ b/templates/dovecot/dovecot-sql.conf.erb
@@ -56,7 +56,7 @@ driver = mysql
 #   connect = /etc/dovecot/authdb.sqlite
 #
 #connect = dbname=virtual user=virtual
-connect = host=<%= postfixadmin_database_host %> dbname=<%= postfixadmin_database_name %> user=<%= postfixadmin_database_user %> password=<%= postfixadmin_database_password %>
+connect = host=<%= scope.lookupvar('postfixadmin::database_host') %> dbname=<%= scope.lookupvar('postfixadmin::database_name') %> user=<%= scope.lookupvar('postfixadmin::database_user') %> password=<%= scope.lookupvar('postfixadmin::database_password') %>
 
 # Default password scheme.
 #
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
diff --git a/templates/postfixadmin/config.inc.php.erb b/templates/postfixadmin/config.inc.php.erb
index 8c4b8cf..404dcb3 100644
--- a/templates/postfixadmin/config.inc.php.erb
+++ b/templates/postfixadmin/config.inc.php.erb
@@ -47,10 +47,10 @@ $CONF['default_language'] = 'en';
 // mysqli = MySQL 4.1+ 
 // pgsql = PostgreSQL
 $CONF['database_type'] = 'mysql';
-$CONF['database_host'] = '<%= postfixadmin_database_host %>';
-$CONF['database_user'] = '<%= postfixadmin_database_user %>';
-$CONF['database_password'] = '<%= postfixadmin_database_password %>';
-$CONF['database_name'] = '<%= postfixadmin_database_name %>';
+$CONF['database_host'] = '<%= database_host %>';
+$CONF['database_user'] = '<%= database_user %>';
+$CONF['database_password'] = '<%= database_password %>';
+$CONF['database_name'] = '<%= database_name %>';
 $CONF['database_prefix'] = '';
 // If you need to specify a different port for a MYSQL database connection, use e.g.
 //   $CONF['database_host'] = '172.30.33.66:3308';
diff --git a/templates/sympa/dbconfig-common.squeeze.erb b/templates/sympa/dbconfig-common.squeeze.erb
index 89aa0a2..91a9c97 100644
--- a/templates/sympa/dbconfig-common.squeeze.erb
+++ b/templates/sympa/dbconfig-common.squeeze.erb
@@ -24,17 +24,17 @@ dbc_dbtype='mysql'
 
 # dbc_dbuser: database user
 #	the name of the user who we will use to connect to the database.
-dbc_dbuser='<%= sympa_database_name %>'
+dbc_dbuser='<%= database_name %>'
 
 # dbc_dbpass: database user password
 #	the password to use with the above username when connecting
 #	to a database, if one is required
-dbc_dbpass='<%= sympa_database_password %>'
+dbc_dbpass='<%= database_password %>'
 
 # dbc_dbserver: database host.  
 #	leave unset to use localhost (or a more efficient local method
 #	if it exists).
-dbc_dbserver='<%= sympa_database_host %>'
+dbc_dbserver='<%= database_host %>'
 
 # dbc_dbport: remote database port
 #	leave unset to use the default.  only applicable if you are
@@ -43,7 +43,7 @@ dbc_dbport=''
 
 # dbc_dbname: name of database
 #	this is the name of your application's database.
-dbc_dbname='<%= sympa_database_name %>'
+dbc_dbname='<%= database_name %>'
 
 # dbc_dbadmin: name of the administrative user
 #	this is the administrative user that is used to create all of the above
diff --git a/templates/sympa/sympa.conf.lenny.erb b/templates/sympa/sympa.conf.lenny.erb
index 6ae9fbd..7740683 100644
--- a/templates/sympa/sympa.conf.lenny.erb
+++ b/templates/sympa/sympa.conf.lenny.erb
@@ -49,18 +49,18 @@ log_level	0
 ###\\\\ General definition ////###
 
 ## Main robot hostname
-domain		<%= sympa_subdomain %>.<%= domain %>
+domain		<%= subdomain %>.<%= domain %>
 
 ## Listmasters email list comma separated
 ## Sympa will associate listmaster privileges to these email addresses (mail and web interfaces). Some error reports may also be sent to these addresses.
-listmaster		<%= sympa_listmasters %>
+listmaster		<%= listmasters %>
 
 ## Local part of sympa email adresse
 ## Effective address will be [EMAIL]@[HOST]
 email	sympa
 
 ## Default lang (cs | de | el | en_US | fr | hu | it | ja_JP | nl | oc | pt_BR | tr)
-lang		<%= sympa_lang %>
+lang		<%= lang %>
 
 ## Who is able to create lists
 ## This parameter is a scenario, check sympa documentation about scenarios if you want to define one
@@ -140,17 +140,17 @@ db_type	mysql
 
 ## Name of the database
 ## with SQLite, the name of the DB corresponds to the DB file
-db_name	<%= sympa_database_name %>
+db_name	<%= database_name %>
 
 ## The host hosting your sympa database
-db_host	<%= sympa_database_host %>
+db_host	<%= database_host %>
 
 ## Database user for connexion
-db_user	<%= sympa_database_name %>
+db_user	<%= database_name %>
 
 ## Database password (associated to the db_user)
 ## What ever you use a password or not, you must protect the SQL server (is it a not a public internet service ?)
-db_passwd	<%= sympa_database_password %>
+db_passwd	<%= database_password %>
 
 ## Database private extention to user table
 ## You need to extend the database format with these fields
@@ -163,15 +163,15 @@ db_passwd	<%= sympa_database_password %>
 ###\\\\ Web interface ////###
 
 ## Sympa's main page URL
-wwsympa_url	https://<%= sympa_subdomain %>.<%= domain %>/wws
+wwurl	https://<%= subdomain %>.<%= domain %>/wws
 
 ## SOAP service URL
-soap_url	https://<%= sympa_subdomain %>.<%= domain %>/sympasoap
+soap_url	https://<%= subdomain %>.<%= domain %>/sympasoap
 
 ## Supported languages for the user interface
 supported_lang	en_US,pt_BR
 
-<%- unless sympa_logo_html_definition.to_s.empty? then -%>
+<%- unless logo_html_definition.to_s.empty? then -%>
 ## Logo
-logo_html_definition <%= sympa_logo_html_definition %>
+logo_html_definition <%= logo_html_definition %>
 <%- end %>
diff --git a/templates/sympa/sympa.conf.squeeze.erb b/templates/sympa/sympa.conf.squeeze.erb
index ff3aba4..29c29d2 100644
--- a/templates/sympa/sympa.conf.squeeze.erb
+++ b/templates/sympa/sympa.conf.squeeze.erb
@@ -49,18 +49,18 @@ log_level	0
 ###\\\\ General definition ////###
 
 ## Main robot hostname
-domain		<%= sympa_subdomain %>.<%= domain %>
+domain		<%= subdomain %>.<%= domain %>
 
 ## Listmasters email list comma separated
 ## Sympa will associate listmaster privileges to these email addresses (mail and web interfaces). Some error reports may also be sent to these addresses.
-listmaster		<%= sympa_listmasters %>
+listmaster		<%= listmasters %>
 
 ## Local part of sympa email adresse
 ## Effective address will be [EMAIL]@[HOST]
 email	sympa
 
 ## Default lang (cs | de | el | en_US | fr | hu | it | ja_JP | nl | oc | pt_BR | tr)
-lang		<%= sympa_lang %>
+lang		<%= lang %>
 
 ## Who is able to create lists
 ## This parameter is a scenario, check sympa documentation about scenarios if you want to define one
@@ -140,17 +140,17 @@ db_type	mysql
 
 ## Name of the database
 ## with SQLite, the name of the DB corresponds to the DB file
-db_name	<%= sympa_database_name %>
+db_name	<%= database_name %>
 
 ## The host hosting your sympa database
-db_host	<%= sympa_database_host %>
+db_host	<%= database_host %>
 
 ## Database user for connexion
-db_user	<%= sympa_database_name %>
+db_user	<%= database_name %>
 
 ## Database password (associated to the db_user)
 ## What ever you use a password or not, you must protect the SQL server (is it a not a public internet service ?)
-db_passwd	<%= sympa_database_password %>
+db_passwd	<%= database_password %>
 
 ## Database private extention to user table
 ## You need to extend the database format with these fields
@@ -163,10 +163,10 @@ db_passwd	<%= sympa_database_password %>
 ###\\\\ Web interface ////###
 
 ## Sympa's main page URL
-wwsympa_url	https://<%= sympa_subdomain %>.<%= domain %>/wws
+wwurl	https://<%= subdomain %>.<%= domain %>/wws
 
 ## SOAP service URL
-soap_url	https://<%= sympa_subdomain %>.<%= domain %>/sympasoap
+soap_url	https://<%= subdomain %>.<%= domain %>/sympasoap
 
 ## Supported languages for the user interface
 supported_lang	en_US,pt_BR
@@ -177,7 +177,7 @@ bounce_halt_rate 50
 bounce_warn_rate 30
 bounce_halt_rate 50
 
-<%- unless sympa_logo_html_definition.to_s.empty? then -%>
+<%- unless logo_html_definition.to_s.empty? then -%>
 ## Logo
-logo_html_definition <%= sympa_logo_html_definition %>
+logo_html_definition <%= logo_html_definition %>
 <%- end %>