From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Jan 2013 00:55:37 +0000 (-0200)
Subject: Fixing variable scoping at postfixadmin config template
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f9a68838314ded7ee38a10e337eb9c796a5c9761;p=puppet-mail.git

Fixing variable scoping at postfixadmin config template
---

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';