From c6b606550d38f420dfa6dce9852305f311e8cdef Mon Sep 17 00:00:00 2001 From: Ryan Lane Date: Tue, 22 Jan 2013 11:53:28 -0800 Subject: [PATCH] Fix alias order so that /w/images isn't overridden Change-Id: Iccadd43221ed621a93beadf358159f94e3848941 Reviewed-on: https://review.openstack.org/20268 Reviewed-by: Clark Boylan Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- modules/mediawiki/templates/apache/mediawiki.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mediawiki/templates/apache/mediawiki.erb b/modules/mediawiki/templates/apache/mediawiki.erb index 82d9758512..d8c7541a11 100644 --- a/modules/mediawiki/templates/apache/mediawiki.erb +++ b/modules/mediawiki/templates/apache/mediawiki.erb @@ -94,9 +94,9 @@ # TTF doesn't have an official MIME type, but I really don't want to use application/octet-stream for it AddType application/x-font-ttf .ttf + Alias /w/images <%= scope.lookupvar('mediawiki::mediawiki_images_location') %> Alias /w <%= scope.lookupvar('mediawiki::mediawiki_location') %> Alias /wiki <%= scope.lookupvar('mediawiki::mediawiki_location') %>/index.php - Alias /w/images <%= scope.lookupvar('mediawiki::mediawiki_images_location') %> # Redirect old /Article_Name urls RewriteEngine on