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

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index ea0fa67de..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,8 +23,5 @@
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-<% if hostname == "spohr" -%>
-        Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
-<% end -%>
 </VirtualHost>
 # vim:set syn=apache: