From f44693f1f20247e0bbe3160324b07edf3e978a25 Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Wed, 22 Jul 2020 13:05:20 +0200
Subject: [PATCH] Override mod_rewrite rules for barrel

This commit updates the apache configuration for the barrel to enforce
all global mod_rewrite rules before the .htaccess' mod_rewrite rules are
enabled.
---
 distillery/resources/compose/barrel/conf/wisski.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/distillery/resources/compose/barrel/conf/wisski.conf b/distillery/resources/compose/barrel/conf/wisski.conf
index 8bc1cc4..05ee47e 100644
--- a/distillery/resources/compose/barrel/conf/wisski.conf
+++ b/distillery/resources/compose/barrel/conf/wisski.conf
@@ -9,8 +9,9 @@
 
         # Rewrite the 'ontology' directory
         RewriteEngine On
-        ReWriteRule ^(ontology/[^/]+/).+ $1 [R=303,L]
-        ReWriteRule ^(ontology/[^/]+)/$ sites/default/files/$1.owl [L]
+        RewriteOptions InheritDownBefore
+        ReWriteRule ^(ontology/[^/]+/).+ $1 [R=303,END]
+        ReWriteRule ^(ontology/[^/]+)/$ sites/default/files/$1.owl [END]
 
         # Allow overrides of symlinks
         Options Indexes FollowSymLinks