Refactoring for 2.7 compatibility

3 files changed, 26 insertions, 26 deletions

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 %>