X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=b07bed535ec093d019ec2d5ea491c0bbf3e7ec81;hb=3ae17fef916b3b1cbfbf0c539b1388c4f7f04ce9;hp=ba55d93b3b38d33cdc1f92cfc58ab0dfd8901f1a;hpb=3ea3aea25101a514630219634a55b8fa9c55576e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index ba55d93b3..b07bed535 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -15,14 +15,14 @@
 	UseCanonicalName Off
 	ServerSignature On
 <%=
-out = ''
-if fqdn == "merkel.debian.org"
-  out = "
+out = case fqdn
+  when "merkel.debian.org"
+  then "
         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"
+                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
@@ -30,13 +30,32 @@ if fqdn == "merkel.debian.org"
                 Allow from all
         </Directory>
 "
+  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>