X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=ceed2d6f47f5e3bf6ee6d0ad1377384c13839604;hb=521f2b44087bbe30746020a2aba93f317995791a;hp=5cb6e1f2fd36b9773583c62c5928359e48c56ab6;hpb=02ad4e819cc717c273537cba1532855ee12298f9;p=mirror%2Fdsa-puppet.git

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