X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=84f4533e2206388193ab917ce01601c4ff839b8f;hb=c00b2b97c65826fd8711891a232fc349bc72e37d;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..84f4533e2 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
-
- 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
-
-"
+out = case fqdn
+ when "master.debian.org" then ""
else
- out = "
+"
UserDir disabled
"
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/\"
+
+ 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
+
+"
+end
out
%>