From: Walter  Huf <walter.huf@corvisa.com>
Date: Tue, 23 Sep 2014 20:18:54 +0000 (-0500)
Subject: Renders a different vhost config for Apache 2.4
X-Git-Tag: v0.8.0~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F158%2Fhead;p=ceph-cookbooks.git

Renders a different vhost config for Apache 2.4
---

diff --git a/.kitchen.yml b/.kitchen.yml
index ee21cc1..ae7e508 100644
--- 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 322fb01..0916868 100644
--- 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>