aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/wikis
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 /deployment/wikis
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 'deployment/wikis')
-rw-r--r--deployment/wikis/manifests/init.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp
index b3c8f04c..c34b06d5 100644
--- a/deployment/wikis/manifests/init.pp
+++ b/deployment/wikis/manifests/init.pp
@@ -10,7 +10,7 @@ class wikis {
}
git::snapshot { $wikis_templates:
- source => "git://git.$::domain/web/templates/mediawiki"
+ source => "git://git.${::domain}/web/templates/mediawiki"
}
$wiki_languages = [ 'en','de', 'fr' ]
@@ -20,11 +20,11 @@ class wikis {
skinsdir => "${wikis_templates}/skins",
}
- apache::vhost::redirect_ssl { "wiki.$::domain": }
+ apache::vhost::redirect_ssl { "wiki.${::domain}": }
- apache::vhost::base { "ssl_wiki.$::domain":
+ apache::vhost::base { "ssl_wiki.${::domain}":
use_ssl => true,
- vhost => "wiki.$::domain",
+ vhost => "wiki.${::domain}",
content => template('wikis/wiki_vhost.conf'),
}
}