X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fapache2%2Ftemplates%2Fdefault-debian.org.erb;h=da101071c50fd7163410b9a1c097a6739acbf2bc;hb=2d3f4be0dea9b52e959d61d4b60720a9eb6e5612;hp=ceed2d6f47f5e3bf6ee6d0ad1377384c13839604;hpb=e576b9593480be04c19a0e3fa648967a1c2f3c85;p=mirror%2Fdsa-puppet.git
diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index ceed2d6f4..da101071c 100644
--- a/modules/apache2/templates/default-debian.org.erb
+++ b/modules/apache2/templates/default-debian.org.erb
@@ -10,11 +10,9 @@
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
@@ -23,8 +21,5 @@
UserDir disabled
-<% if hostname == "spohr" -%>
- Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
-<% end -%>
# vim:set syn=apache: