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=84f4533e2206388193ab917ce01601c4ff839b8f;hpb=215a052cae9e4e1862c9ce67461ae4091d95371d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 84f4533e2..ceed2d6f4 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,42 +7,24 @@
 	ServerAdmin debian-admin@debian.org
 
 	ErrorLog /var/log/apache2/error.log
-	CustomLog /var/log/apache2/access.log combined
+	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
 	ServerSignature On
-<%=
-out = case fqdn
-  when "master.debian.org" then ""
-else
-"
+
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-"
-end
-case fqdn
-  when "spohr.debian.org" then
-    out += "
-        Alias /debian \"/org/mirrors/ftp.debian.org/ftp\"
-"
-  when "piatti.debian.org" then
-    out += "
-       # for piuparts, RT#1218
-       Alias /debian/ \"/org/mirrors/ftp.debian.org/ftp/\"
-       <Directory \"/org/mirrors/ftp.debian.org/ftp/\">
-               Options Indexes MultiViews FollowSymLinks
-               AllowOverride None
-               Order deny,allow
-               Deny from all
-               Allow from 127.0.0.0/255.0.0.0 ::1/128 193.167.161.225/32
-       </Directory>
-"
-end
-out
-%>
+<% if hostname == "spohr" -%>
+        Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
+<% end -%>
 </VirtualHost>
 # vim:set syn=apache: