From: Julien Cristau <jcristau@debian.org>
Date: Mon, 27 Apr 2015 20:17:20 +0000 (+0200)
Subject: Handle apache 2.4 authz_host config in www.debian.org template
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=bd6de882e6b5df4dbecec73a30f85c48be5ef7cd

Handle apache 2.4 authz_host config in www.debian.org template
---

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 0b418c55..8c39f290 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,6 +10,10 @@
   # Make sure that the srm.conf directive is commented out.
   AddDefaultCharSet Off
   AllowOverride AuthConfig FileInfo
+  <% if @lsbmajdistrelease > '7' -%>
+    Require all granted
+  <% end -%>
+
 
   # Serve icons as image/x-icon
   AddType image/x-icon .ico