diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
| commit | c61daf65b58b943994d1f21e52deee9a9ce04827 (patch) | |
| tree | ffeb83234cb01580abe04217f8b8eca9698d5424 /modules/phpbb | |
| parent | c4cb8478752701a83c4e3b4b73d661e188d67daa (diff) | |
| download | puppet-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')
| -rw-r--r-- | modules/phpbb/manifests/base.pp | 6 | ||||
| -rw-r--r-- | modules/phpbb/manifests/config.pp | 2 | ||||
| -rw-r--r-- | modules/phpbb/manifests/instance.pp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/phpbb/manifests/base.pp b/modules/phpbb/manifests/base.pp index 115c4592..c2328ac2 100644 --- a/modules/phpbb/manifests/base.pp +++ b/modules/phpbb/manifests/base.pp @@ -31,13 +31,13 @@ class phpbb::base { } # TODO check that everything is locked down - apache::vhost::base { "forums.$::domain": + apache::vhost::base { "forums.${::domain}": content => template('phpbb/forums_vhost.conf'), } - apache::vhost::base { "ssl_forums.$::domain": + apache::vhost::base { "ssl_forums.${::domain}": use_ssl => true, - vhost => "forums.$::domain", + vhost => "forums.${::domain}", content => template('phpbb/forums_vhost.conf'), } diff --git a/modules/phpbb/manifests/config.pp b/modules/phpbb/manifests/config.pp index 90e01f5e..7d84ff54 100644 --- a/modules/phpbb/manifests/config.pp +++ b/modules/phpbb/manifests/config.pp @@ -5,7 +5,7 @@ define phpbb::config($key, $value, $database) { environment => ["PGDATABASE=${database}", "PGUSER=$phpbb::base::user", "PGPASSWORD=$phpbb::base::pgsql_password", - "PGHOST=pgsql.$::domain", + "PGHOST=pgsql.${::domain}", "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 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; } |