X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=ea0fa67de973d1e2d4ec92456bbf4ab4b28a8146;hb=fe22b3b8f19a26c1c1d698e17c048f402246d183;hp=84f4533e2206388193ab917ce01601c4ff839b8f;hpb=215a052cae9e4e1862c9ce67461ae4091d95371d;p=mirror%2Fdsa-puppet.git
diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 84f4533e2..ea0fa67de 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,42 +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 "master.debian.org" then ""
-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: