Major refactor

22 files changed, 37 insertions, 37 deletions

diff --git a/templates/dovecot/dovecot-sql.conf.erb b/templates/dovecot/dovecot-sql.conf.erb
index 1e93a2b..6f7b660 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=<%= @database_host %> dbname=<%= @database_name %> user=<%= @database_user %> password=<%= @database_password %>
+connect = host=<%= scope.lookupvar('mail::virtual::database_host') %> dbname=<%= scope.lookupvar('mail::virtual::database_name') %> user=<%= scope.lookupvar('mail::virtual::database_user') %> password=<%= scope.lookupvar('mail::virtual::database_password') %>
 
 # Default password scheme.
 #
diff --git a/templates/postfix/firma/transport_regexp.erb b/templates/firma/transport_regexp.erb
index 27c65af..27c65af 100644
--- a/templates/postfix/firma/transport_regexp.erb
+++ b/templates/firma/transport_regexp.erb
diff --git a/templates/postfix/firma/virtual_regexp.erb b/templates/firma/virtual_regexp.erb
index 767f3c1..767f3c1 100644
--- a/templates/postfix/firma/virtual_regexp.erb
+++ b/templates/firma/virtual_regexp.erb
diff --git a/templates/postfix/mlmmj/transport_regexp.erb b/templates/mlmmj/transport_regexp.erb
index e69de29..e69de29 100644
--- a/templates/postfix/mlmmj/transport_regexp.erb
+++ b/templates/mlmmj/transport_regexp.erb
diff --git a/templates/postfix/mlmmj/virtual_regexp.erb b/templates/mlmmj/virtual_regexp.erb
index 57f1a72..57f1a72 100644
--- a/templates/postfix/mlmmj/virtual_regexp.erb
+++ b/templates/mlmmj/virtual_regexp.erb
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_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/sympa/transport_regexp.erb
index 1e32e2a..1e32e2a 100644
--- a/templates/postfix/sympa/transport_regexp.erb
+++ b/templates/sympa/transport_regexp.erb
diff --git a/templates/postfix/sympa/virtual_regexp.erb b/templates/sympa/virtual_regexp.erb
index f5883d7..f5883d7 100644
--- a/templates/postfix/sympa/virtual_regexp.erb
+++ b/templates/sympa/virtual_regexp.erb
diff --git a/templates/virtual/database/mysql_virtual_alias_domain_catchall_maps.cf.erb b/templates/virtual/database/mysql_virtual_alias_domain_catchall_maps.cf.erb
new file mode 100644
index 0000000..daa4b06
--- /dev/null
+++ b/templates/virtual/database/mysql_virtual_alias_domain_catchall_maps.cf.erb
@@ -0,0 +1,5 @@
+user      = <%= scope.lookupvar('mail::virtual::database_user') %>
+password  = <%= scope.lookupvar('mail::virtual::database_password') %>
+hosts     = <%= scope.lookupvar('mail::virtual::database_host') %>
+dbname    = <%= scope.lookupvar('mail::virtual::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/virtual/database/mysql_virtual_alias_domain_mailbox_maps.cf.erb b/templates/virtual/database/mysql_virtual_alias_domain_mailbox_maps.cf.erb
new file mode 100644
index 0000000..9f16c20
--- /dev/null
+++ b/templates/virtual/database/mysql_virtual_alias_domain_mailbox_maps.cf.erb
@@ -0,0 +1,5 @@
+user      = <%= scope.lookupvar('mail::virtual::database_user') %>
+password  = <%= scope.lookupvar('mail::virtual::database_password') %>
+hosts     = <%= scope.lookupvar('mail::virtual::database_host') %>
+dbname    = <%= scope.lookupvar('mail::virtual::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/virtual/database/mysql_virtual_alias_domain_maps.cf.erb b/templates/virtual/database/mysql_virtual_alias_domain_maps.cf.erb
new file mode 100644
index 0000000..1edf8e3
--- /dev/null
+++ b/templates/virtual/database/mysql_virtual_alias_domain_maps.cf.erb
@@ -0,0 +1,5 @@
+user      = <%= scope.lookupvar('mail::virtual::database_user') %>
+password  = <%= scope.lookupvar('mail::virtual::database_password') %>
+hosts     = <%= scope.lookupvar('mail::virtual::database_host') %>
+dbname    = <%= scope.lookupvar('mail::virtual::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/virtual/database/mysql_virtual_alias_maps.cf.erb b/templates/virtual/database/mysql_virtual_alias_maps.cf.erb
new file mode 100644
index 0000000..0553bc4
--- /dev/null
+++ b/templates/virtual/database/mysql_virtual_alias_maps.cf.erb
@@ -0,0 +1,6 @@
+user      = <%= scope.lookupvar('mail::virtual::database_user') %>
+password  = <%= scope.lookupvar('mail::virtual::database_password') %>
+hosts     = <%= scope.lookupvar('mail::virtual::database_host') %>
+dbname    = <%= scope.lookupvar('mail::virtual::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/virtual/database/mysql_virtual_domains_maps.cf.erb
index ecf253e..cb1322f 100644
--- a/templates/postfix/sql/mysql_virtual_domains_maps.cf.erb
+++ b/templates/virtual/database/mysql_virtual_domains_maps.cf.erb
@@ -1,7 +1,7 @@
-user      = <%= database_user %>
-password  = <%= database_password %>
-hosts     = <%= database_host %>
-dbname    = <%= database_name %>
+user      = <%= scope.lookupvar('mail::virtual::database_user') %>
+password  = <%= scope.lookupvar('mail::virtual::database_password') %>
+hosts     = <%= scope.lookupvar('mail::virtual::database_host') %>
+dbname    = <%= scope.lookupvar('mail::virtual::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/virtual/database/mysql_virtual_mailbox_limit_maps.cf.erb b/templates/virtual/database/mysql_virtual_mailbox_limit_maps.cf.erb
new file mode 100644
index 0000000..2b9f837
--- /dev/null
+++ b/templates/virtual/database/mysql_virtual_mailbox_limit_maps.cf.erb
@@ -0,0 +1,5 @@
+user      = <%= scope.lookupvar('mail::virtual::database_user') %>
+password  = <%= scope.lookupvar('mail::virtual::database_password') %>
+hosts     = <%= scope.lookupvar('mail::virtual::database_host') %>
+dbname    = <%= scope.lookupvar('mail::virtual::database_name') %>
+query     = SELECT quota FROM mailbox WHERE username='%s' AND active = '1'
diff --git a/templates/virtual/database/mysql_virtual_mailbox_maps.cf.erb b/templates/virtual/database/mysql_virtual_mailbox_maps.cf.erb
new file mode 100644
index 0000000..c90938f
--- /dev/null
+++ b/templates/virtual/database/mysql_virtual_mailbox_maps.cf.erb
@@ -0,0 +1,6 @@
+user      = <%= scope.lookupvar('mail::virtual::database_user') %>
+password  = <%= scope.lookupvar('mail::virtual::database_password') %>
+hosts     = <%= scope.lookupvar('mail::virtual::database_host') %>
+dbname    = <%= scope.lookupvar('mail::virtual::database_name') %>
+query     = SELECT maildir FROM mailbox WHERE username='%s' AND active = '1'
+#expansion_limit = 100
diff --git a/templates/postfixadmin/config.inc.php.erb b/templates/virtual/postfixadmin/config.inc.php.erb
index 404dcb3..404dcb3 100644
--- a/templates/postfixadmin/config.inc.php.erb
+++ b/templates/virtual/postfixadmin/config.inc.php.erb
diff --git a/templates/roundcube/main.inc.php.erb b/templates/virtual/roundcube/main.inc.php.erb
index 5582ce0..5582ce0 100644
--- a/templates/roundcube/main.inc.php.erb
+++ b/templates/virtual/roundcube/main.inc.php.erb