X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=da101071c50fd7163410b9a1c097a6739acbf2bc;hb=15c05169c6ce5b4a23cad58fb09a153cfd7ffbf0;hp=9f40d2a2e55c40527c3f4d8fe02365af0b63f01c;hpb=250b44d39b2a25ab5785374b4fcb3c2afa07ad23;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 9f40d2a2e..da101071c 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -10,40 +10,16 @@
 	CustomLog /var/log/apache2/access.log privacy
 
 	DocumentRoot /srv/www/default.debian.org/htdocs
+	<Directory /srv/www/default.debian.org/htdocs>
+		Require all granted
+	</Directory>
 
 	HostnameLookups Off
 	UseCanonicalName Off
 	ServerSignature On
-<%=
-out = case fqdn
-  when "master.debian.org" then ""
-  when "vento.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
-%>
 </VirtualHost>
 # vim:set syn=apache: