X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=ceed2d6f47f5e3bf6ee6d0ad1377384c13839604;hb=d8092dac8d43bc6d789c26cf7e1862d5464e9b39;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..ceed2d6f4 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -10,6 +10,11 @@
CustomLog /var/log/apache2/access.log privacy
DocumentRoot /srv/www/default.debian.org/htdocs
+ <% if @lsbmajdistrelease > '7' -%>
+
+ Require all granted
+
+ <% end -%>
HostnameLookups Off
UseCanonicalName Off
@@ -18,26 +23,8 @@
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
-%>
+<% if hostname == "spohr" -%>
+ Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
+<% end -%>
# vim:set syn=apache: