X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=0c9eff39a2901e9e2d6aacfbd45784ae41ff42ff;hb=ab52321ca7ccd1b0c42c41cd62d4a06b976e119c;hp=2a5beb0f16bdecf3a387dad974dec71e927068ef;hpb=1070137fdc4e4594d6ad4bfef27f696d5f209147;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 2a5beb0f1..0c9eff39a 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 scope.call_function('versioncmp', [@lsbmajdistrelease, '7']) > 0 -%>
+	<Directory /srv/www/default.debian.org/htdocs>
+		Require all granted
+	</Directory>
+	<% end -%>
 
 	HostnameLookups Off
 	UseCanonicalName Off
@@ -18,14 +23,5 @@
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-<%=
-case fqdn
-  when "spohr.debian.org" then
-    out += "
-        Alias /debian \"/srv/mirrors/ftp.debian.org/ftp\"
-"
-end
-out
-%>
 </VirtualHost>
 # vim:set syn=apache: