X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=167c4fe6d1cde364e79f08433e2a4b81bd196128;hb=d66548d20484651943302108162b6647d1122015;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..167c4fe6d 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -14,21 +14,15 @@
 	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\"
+        Alias /debian \"/srv/mirrors/ftp.debian.org/ftp\"
 "
   when "piatti.debian.org" then
     out += "