diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 19:17:17 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 19:17:17 +0300 |
| commit | 27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2 (patch) | |
| tree | 066647fa051720fac7a2e21a2a8d9759f42b3d46 /modules/phpbb | |
| parent | c61daf65b58b943994d1f21e52deee9a9ce04827 (diff) | |
| download | puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar.gz puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar.bz2 puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar.xz puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.zip | |
variable enclosing fixes
Diffstat (limited to 'modules/phpbb')
| -rw-r--r-- | modules/phpbb/manifests/config.pp | 6 | ||||
| -rw-r--r-- | modules/phpbb/manifests/instance.pp | 4 |
2 files changed, 5 insertions, 5 deletions
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}": |