MODULES-1294 Fix issue with auth_require not taking precedence over d…

…efault of require all granted, added checks for require and auth_require before adding the default
xbezdick · Sep 16, 2014 · 0d39322 · 0d39322
1 parent 7a98903
commit 0d39322
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
@@ -37,7 +37,11 @@
     <%- if @apache_version == '2.4' -%>
       <%- if directory['require'] and directory['require'] != '' -%>
     Require <%= Array(directory['require']).join(' ') %>
-      <%- else -%>
+      <%- end -%>
+      <%- if directory['auth_require'] -%>
+    Require <%= directory['auth_require'] %>
+      <%- end -%>
+      <%- if !(directory['require'] and directory['require'] != '') && !(directory['auth_require']) -%>
     Require all granted
       <%- end -%>
     <%- else -%>
@@ -127,9 +131,6 @@
     <%- if directory['auth_group_file'] -%>
     AuthGroupFile <%= directory['auth_group_file'] %>
     <%- end -%>
-    <%- if directory['auth_require'] -%>
-    Require <%= directory['auth_require'] %>
-    <%- end -%>
     <%- if directory['fallbackresource'] -%>
     FallbackResource <%= directory['fallbackresource'] %>
     <%- end -%>