aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-10-26 16:51:24 +0000
committerNicolas Vigier <boklm@mageia.org>2011-10-26 16:51:24 +0000
commit1f10d4f1371b0e1994488c19da4817bcf5c8dfc6 (patch)
treec30f1ec259f1e950f094ca7669094bac0a5c039f
parent077c66fcba04b308ec79e6a9b6d00429e5999405 (diff)
downloadpuppet-1f10d4f1371b0e1994488c19da4817bcf5c8dfc6.tar
puppet-1f10d4f1371b0e1994488c19da4817bcf5c8dfc6.tar.gz
puppet-1f10d4f1371b0e1994488c19da4817bcf5c8dfc6.tar.bz2
puppet-1f10d4f1371b0e1994488c19da4817bcf5c8dfc6.tar.xz
puppet-1f10d4f1371b0e1994488c19da4817bcf5c8dfc6.zip
set default handler for images directory
-rw-r--r--deployment/wikis/templates/wiki_vhost.conf4
-rw-r--r--modules/mediawiki/templates/wiki_vhost.conf4
2 files changed, 8 insertions, 0 deletions
diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf
index d8618873..72b66540 100644
--- a/deployment/wikis/templates/wiki_vhost.conf
+++ b/deployment/wikis/templates/wiki_vhost.conf
@@ -15,6 +15,10 @@ RewriteRule ^/?$ /en/ [R]
<%- for lang in wiki_languages -%>
+<Directory <%= wikis_root %>/<%= lang %>/images>
+ SetHandler default-handler
+</Directory>
+
Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php
Alias /mw-<%= lang %> <%= wikis_root %>/<%= lang %>
diff --git a/modules/mediawiki/templates/wiki_vhost.conf b/modules/mediawiki/templates/wiki_vhost.conf
index 1464856f..3fe038c3 100644
--- a/modules/mediawiki/templates/wiki_vhost.conf
+++ b/modules/mediawiki/templates/wiki_vhost.conf
@@ -3,6 +3,10 @@
Options +FollowSymLinks
</Directory>
+<Directory <%= root %>/images>
+ SetHandler default-handler
+</Directory>
+
AliasMatch /.*/skins/(.*)$ /usr/share/mediawiki/skins/$1
RewriteEngine On