summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-24 22:55:37 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-24 22:55:37 -0200
commitf9a68838314ded7ee38a10e337eb9c796a5c9761 (patch)
tree502020ded513783fd5debd7aae5897c004d7ca08 /templates
parent00203b5199821a2b2a41a26e59ca15940866aec9 (diff)
downloadpuppet-mail-f9a68838314ded7ee38a10e337eb9c796a5c9761.tar.gz
puppet-mail-f9a68838314ded7ee38a10e337eb9c796a5c9761.tar.bz2
Fixing variable scoping at postfixadmin config template
Diffstat (limited to 'templates')
-rw-r--r--templates/virtual/postfixadmin/config.inc.php.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/virtual/postfixadmin/config.inc.php.erb b/templates/virtual/postfixadmin/config.inc.php.erb
index 404dcb3..58b91b7 100644
--- a/templates/virtual/postfixadmin/config.inc.php.erb
+++ b/templates/virtual/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'] = '<%= database_host %>';
-$CONF['database_user'] = '<%= database_user %>';
-$CONF['database_password'] = '<%= database_password %>';
-$CONF['database_name'] = '<%= database_name %>';
+$CONF['database_host'] = '<%= scope.lookupvar('mail::virtual::database_host') %>';
+$CONF['database_user'] = '<%= scope.lookupvar('mail::virtual::database_user') %>';
+$CONF['database_password'] = '<%= scope.lookupvar('mail::virtual::database_password') %>';
+$CONF['database_name'] = '<%= scope.lookupvar('mail::virtual::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';