X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=ea0fa67de973d1e2d4ec92456bbf4ab4b28a8146;hb=b85152452204fdacaa807997158c1980dcb26ebe;hp=0d2159cc762791b618166af678396ff605b76155;hpb=fa78ccb5449b0ad1aac9df21b3b20a9b389109bc;p=mirror%2Fdsa-puppet.git
diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 0d2159cc7..ea0fa67de 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,55 +7,19 @@
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 = case fqdn
- when "merkel.debian.org"
- then "
- 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
-"
+
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
-%>
+<% if hostname == "spohr" -%>
+ Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
+<% end -%>
# vim:set syn=apache: