]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
Handle apache 2.4 authz_host config in www.debian.org template
authorJulien Cristau <jcristau@debian.org>
Mon, 27 Apr 2015 20:17:20 +0000 (22:17 +0200)
committerJulien Cristau <jcristau@debian.org>
Mon, 27 Apr 2015 20:17:20 +0000 (22:17 +0200)
modules/roles/templates/apache-www.debian.org.erb

index 0b418c5538e72b1ad2291b843176adc8e53ddf84..8c39f2905f8cad25743f6b60b59473d2e14ed2e7 100644 (file)
   # 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