From 27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Tue, 20 Oct 2015 19:17:17 +0300
Subject: variable enclosing fixes

---
 modules/phpbb/manifests/config.pp   | 6 +++---
 modules/phpbb/manifests/instance.pp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/phpbb')

diff --git a/modules/phpbb/manifests/config.pp b/modules/phpbb/manifests/config.pp
index 7d84ff54..553b0f74 100644
--- a/modules/phpbb/manifests/config.pp
+++ b/modules/phpbb/manifests/config.pp
@@ -3,10 +3,10 @@ define phpbb::config($key, $value, $database) {
         command     => "/usr/local/bin/phpbb_apply_config.pl ${key}",
         user        => 'root',
         environment => ["PGDATABASE=${database}",
-                        "PGUSER=$phpbb::base::user",
-                        "PGPASSWORD=$phpbb::base::pgsql_password",
+                        "PGUSER=${phpbb::base::user}",
+                        "PGPASSWORD=${phpbb::base::pgsql_password}",
                         "PGHOST=pgsql.${::domain}",
-                        "VALUE=$value"],
+                        "VALUE=${value}"],
         require     => File['/usr/local/bin/phpbb_apply_config.pl'],
     }
 }
diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp
index e717ea7f..d688b019 100644
--- a/modules/phpbb/manifests/instance.pp
+++ b/modules/phpbb/manifests/instance.pp
@@ -57,13 +57,13 @@ define phpbb::instance() {
 
     phpbb::config {
         "ldap_user/${lang}":
-            key => 'ldap_user', value => "cn=phpbb-$::hostname,ou=System Accounts,$::dc_suffix";
+            key => 'ldap_user', value => "cn=phpbb-${::hostname},ou=System Accounts,${::dc_suffix}";
         "ldap_server/${lang}":
             key => 'ldap_server', value => "ldaps://ldap.${::domain} ldaps://ldap-slave-1.${::domain}";
         "ldap_password/${lang}":
             key => 'ldap_password', value => $ldap_password;
         "ldap_base_dn/${lang}":
-            key => 'ldap_base_dn', value => "ou=People,$::dc_suffix";
+            key => 'ldap_base_dn', value => "ou=People,${::dc_suffix}";
         "auth_method/${lang}":
             key => 'auth_method', value => 'ldap';
         "ldap_mail/${lang}":
-- 
cgit v1.2.1