X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=84f4533e2206388193ab917ce01601c4ff839b8f;hb=bf1f67c1d65d4d297e7706726201b3d0d01f1f8c;hp=ba55d93b3b38d33cdc1f92cfc58ab0dfd8901f1a;hpb=3ea3aea25101a514630219634a55b8fa9c55576e;p=dsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index ba55d93b..84f4533e 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -15,28 +15,33 @@
 	UseCanonicalName Off
 	ServerSignature On
 <%=
-out = ''
-if fqdn == "merkel.debian.org"
-  out = "
-        RemoveType .php .phtml .php3 .phps
-        php_admin_flag engine off
-        <Directory /home/don/public_html/cgi>
-                SetEnv PERLLIB "/home/don/perl/usr/share/perl5:/home/don/source/"
-                SetEnv DEBBUGS_CONFIG_FILE "/home/don/config_internal"
-                SetHandler cgi-script
-                AllowOverride None
-                Options +ExecCGI
-                Order allow,deny
-                Allow from all
-        </Directory>
-"
+out = case fqdn
+  when "master.debian.org" then ""
 else
-  out = "
+"
 	<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>