aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/wikis
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-10-19 20:20:01 +0300
committerThomas Backlund <tmb@mageia.org>2015-10-19 20:20:01 +0300
commitd139941bf8abaf27f7ad307e985672a37301239b (patch)
tree13f04cd35a2be3b069da633837813aef7f5eb372 /deployment/wikis
parent814d434eb7e7d8a89dac98b1a60afc10a6980617 (diff)
downloadpuppet-d139941bf8abaf27f7ad307e985672a37301239b.tar
puppet-d139941bf8abaf27f7ad307e985672a37301239b.tar.gz
puppet-d139941bf8abaf27f7ad307e985672a37301239b.tar.bz2
puppet-d139941bf8abaf27f7ad307e985672a37301239b.tar.xz
puppet-d139941bf8abaf27f7ad307e985672a37301239b.zip
lint fixes for wikis
Diffstat (limited to 'deployment/wikis')
-rw-r--r--deployment/wikis/manifests/init.pp2
-rw-r--r--deployment/wikis/templates/wiki_vhost.conf1
2 files changed, 1 insertions, 2 deletions
diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp
index 6adbe6d0..b3c8f04c 100644
--- a/deployment/wikis/manifests/init.pp
+++ b/deployment/wikis/manifests/init.pp
@@ -17,7 +17,7 @@ class wikis {
mediawiki::instance { $wiki_languages:
title => 'Mageia wiki',
wiki_settings => template('wikis/wiki_settings'),
- skinsdir => "$wikis_templates/skins",
+ skinsdir => "${wikis_templates}/skins",
}
apache::vhost::redirect_ssl { "wiki.$::domain": }
diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf
index e8e4fd6d..d4e5e0a2 100644
--- a/deployment/wikis/templates/wiki_vhost.conf
+++ b/deployment/wikis/templates/wiki_vhost.conf
@@ -15,4 +15,3 @@ Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php
Alias /mw-<%= lang %> <%= wikis_root %>/<%= lang %>
<%- end -%>
-