Renders a different vhost config for Apache 2.4

diff --git a/.kitchen.yml b/.kitchen.yml
index ee21cc1681a61d50ac82f34e25d295a8b9f50d68..ae7e5082d118057249cfa3c3bc965088acecf356 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -11,6 +11,9 @@ platforms:
 - name: ubuntu-14.04
   run_list:
     - recipe[apt]
+  attributes:
+    apache:
+      mpm: event        # ugly workaround for onehealth-cookbooks/apache2 #236
 - name: debian-7.4
   run_list:
     - recipe[apt]

diff --git a/templates/default/rgw.conf.erb b/templates/default/rgw.conf.erb
index 322fb0124957447330ffdd3b8558411f769c3f9e..0916868df8d836120ead43decf78e955c31aba49 100644 (file)
--- a/templates/default/rgw.conf.erb
+++ b/templates/default/rgw.conf.erb
@@ -25,9 +25,13 @@ LogFormat "%{X-Forwarded-For}i %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{Use
       Options +ExecCGI
       AllowOverride All
       SetHandler fastcgi-script
+      AuthBasicAuthoritative Off
+      <%- if node[:apache][:version].to_f < 2.4 %>
       Order allow,deny
       Allow from all
-      AuthBasicAuthoritative Off
+      <%- else %>
+      Require all granted
+      <%- end %>
     </Directory>
   </IfModule>