X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=da101071c50fd7163410b9a1c097a6739acbf2bc;hb=1880a0ed4cd8dca05733a088b65cf98b0591527e;hp=131f0218d0ca29003c91875f8bdc270cf655cbea;hpb=336ff1cf1197b0896c4f377f42bf3abc714d10f2;p=mirror%2Fdsa-puppet.git
diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 131f0218d..da101071c 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -7,43 +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
+
+ Require all granted
+
HostnameLookups Off
UseCanonicalName Off
ServerSignature On
-<%=
-out = case fqdn
- when "master.debian.org" then ""
- when "vento.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
-%>
# vim:set syn=apache: