Postfixadmin configuration

7 files changed, 28 insertions, 28 deletions

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 19374f2..9fa4867 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_user %>
-password  = <%= postfixadmin_password %>
-hosts     = <%= postfixadmin_hosts %>
-dbname    = <%= postfixadmin_dbname %>
+user      = <%= postfixadmin_database_user %>
+password  = <%= postfixadmin_database_password %>
+hosts     = <%= postfixadmin_database_host %>
+dbname    = <%= postfixadmin_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 ef7a880..b7aabf2 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_user %>
-password  = <%= postfixadmin_password %>
-hosts     = <%= postfixadmin_hosts %>
-dbname    = <%= postfixadmin_dbname %>
+user      = <%= postfixadmin_database_user %>
+password  = <%= postfixadmin_database_password %>
+hosts     = <%= postfixadmin_database_host %>
+dbname    = <%= postfixadmin_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 10da8ad..ac120c0 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_user %>
-password  = <%= postfixadmin_password %>
-hosts     = <%= postfixadmin_hosts %>
-dbname    = <%= postfixadmin_dbname %>
+user      = <%= postfixadmin_database_user %>
+password  = <%= postfixadmin_database_password %>
+hosts     = <%= postfixadmin_database_host %>
+dbname    = <%= postfixadmin_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 2bf5d9d..f80c6fc 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_user %>
-password  = <%= postfixadmin_password %>
-hosts     = <%= postfixadmin_hosts %>
-dbname    = <%= postfixadmin_dbname %>
+user      = <%= postfixadmin_database_user %>
+password  = <%= postfixadmin_database_password %>
+hosts     = <%= postfixadmin_database_host %>
+dbname    = <%= postfixadmin_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 cc26c90..0706f4b 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_user %>
-password  = <%= postfixadmin_password %>
-hosts     = <%= postfixadmin_hosts %>
-dbname    = <%= postfixadmin_dbname %>
+user      = <%= postfixadmin_database_user %>
+password  = <%= postfixadmin_database_password %>
+hosts     = <%= postfixadmin_database_host %>
+dbname    = <%= postfixadmin_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 357bcb3..61804f3 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_user %>
-password  = <%= postfixadmin_password %>
-hosts     = <%= postfixadmin_hosts %>
-dbname    = <%= postfixadmin_dbname %>
+user      = <%= postfixadmin_database_user %>
+password  = <%= postfixadmin_database_password %>
+hosts     = <%= postfixadmin_database_host %>
+dbname    = <%= postfixadmin_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 6d3d642..f52049b 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_user %>
-password  = <%= postfixadmin_password %>
-hosts     = <%= postfixadmin_hosts %>
-dbname    = <%= postfixadmin_dbname %>
+user      = <%= postfixadmin_database_user %>
+password  = <%= postfixadmin_database_password %>
+hosts     = <%= postfixadmin_database_host %>
+dbname    = <%= postfixadmin_database_name %>
 query     = SELECT maildir FROM mailbox WHERE username='%s' AND active = '1'
 #expansion_limit = 100