X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=167c4fe6d1cde364e79f08433e2a4b81bd196128;hb=0fda04c3b4a7661de662fbc4771dc1d110f5e29c;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..167c4fe6d 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,34 +7,34 @@
ServerAdmin debian-admin@debian.org
ErrorLog /var/log/apache2/error.log
- CustomLog /var/log/apache2/access.log combined
+ CustomLog /var/log/apache2/access.log privacy
DocumentRoot /srv/www/default.debian.org/htdocs
HostnameLookups Off
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
-
-"
-else
- out = "
+
UserDir disabled
+<%=
+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/\"
+
+ 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