X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=da101071c50fd7163410b9a1c097a6739acbf2bc;hb=2d3f4be0dea9b52e959d61d4b60720a9eb6e5612;hp=861e0e3af0228011ff8d684a7ffba98919e4b752;hpb=6db79c9107569829cb1a320a49bd0b2022983b61;p=mirror%2Fdsa-puppet.git
diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 861e0e3af..da101071c 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -10,6 +10,9 @@
CustomLog /var/log/apache2/access.log privacy
DocumentRoot /srv/www/default.debian.org/htdocs
+
+ Require all granted
+
HostnameLookups Off
UseCanonicalName Off
@@ -18,26 +21,5 @@
UserDir disabled
-<%=
-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: