From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Feb 2015 13:01:55 +0000 (+0100)
Subject: apache 2.4 config for default vhost
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e576b9593480be04c19a0e3fa648967a1c2f3c85;p=mirror%2Fdsa-puppet.git

apache 2.4 config for default vhost
---

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index ea0fa67de..ceed2d6f4 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -10,6 +10,11 @@
 	CustomLog /var/log/apache2/access.log privacy
 
 	DocumentRoot /srv/www/default.debian.org/htdocs
+	<% if @lsbmajdistrelease > '7' -%>
+	<Directory /srv/www/default.debian.org/htdocs>
+		Require all granted
+	</Directory>
+	<% end -%>
 
 	HostnameLookups Off
 	UseCanonicalName Off