X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=ea0fa67de973d1e2d4ec92456bbf4ab4b28a8146;hb=373044350a9e4239c0fcd36eb5efcf8cc02754ae;hp=167c4fe6d1cde364e79f08433e2a4b81bd196128;hpb=3c2d5808649bffe49f6318969d988031ff7191b5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 167c4fe6d..ea0fa67de 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -18,26 +18,8 @@
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-<%=
-case fqdn
-  when "spohr.debian.org" then
-    out += "
-        Alias /debian \"/srv/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: