aboutsummaryrefslogtreecommitdiffstats
path: root/modules/phpbb/manifests/instance.pp
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-10-20 17:51:42 +0300
committerThomas Backlund <tmb@mageia.org>2015-10-20 17:51:42 +0300
commitc61daf65b58b943994d1f21e52deee9a9ce04827 (patch)
treeffeb83234cb01580abe04217f8b8eca9698d5424 /modules/phpbb/manifests/instance.pp
parentc4cb8478752701a83c4e3b4b73d661e188d67daa (diff)
downloadpuppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar
puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.gz
puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.bz2
puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.xz
puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.zip
use consistent domain references
Diffstat (limited to 'modules/phpbb/manifests/instance.pp')
-rw-r--r--modules/phpbb/manifests/instance.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp
index 486b2d3a..e717ea7f 100644
--- a/modules/phpbb/manifests/instance.pp
+++ b/modules/phpbb/manifests/instance.pp
@@ -10,7 +10,7 @@ define phpbb::instance() {
include git::client
exec { "git_clone ${lang}":
- command =>"git clone git://git.$::domain/web/forums/ ${lang}",
+ command =>"git clone git://git.${::domain}/web/forums/ ${lang}",
cwd => $forums_dir,
creates => "${forums_dir}/${lang}",
require => File[$forums_dir],
@@ -59,7 +59,7 @@ define phpbb::instance() {
"ldap_user/${lang}":
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";
+ 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}":
@@ -71,9 +71,9 @@ define phpbb::instance() {
"ldap_uid/${lang}":
key => 'ldap_uid', value => 'uid';
"cookie_domain/${lang}":
- key => 'cookie_domain', value => "forums.$::domain";
+ key => 'cookie_domain', value => "forums.${::domain}";
"server_name/${lang}":
- key => 'server_name', value => "forums.$::domain";
+ key => 'server_name', value => "forums.${::domain}";
"default_lang/${lang}":
key => 'default_lang', value => $lang;
}