Apply Aurelien's nfs patch to the dsa-check-libs copy in puppet also

[dsa-puppet.git] / modules / apache2 / templates / default-debian.org.erb

diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb
index 5cb6e1f2fd36b9773583c62c5928359e48c56ab6..ceed2d6f47f5e3bf6ee6d0ad1377384c13839604 100644 (file)
--- 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' -%>
+       <Directory /srv/www/default.debian.org/htdocs>
+               Require all granted
+       </Directory>
+       <% end -%>
 
        HostnameLookups Off
        UseCanonicalName Off
@@ -18,5 +23,8 @@
        <IfModule mod_userdir.c>
                UserDir disabled
        </IfModule>
+<% if hostname == "spohr" -%>
+        Alias /debian "/srv/mirrors/ftp.debian.org/ftp"
+<% end -%>
 </VirtualHost>
 # vim:set syn=apache: