X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-www.debian.org.erb;h=8c39f2905f8cad25743f6b60b59473d2e14ed2e7;hb=bd6de882e6b5df4dbecec73a30f85c48be5ef7cd;hp=12d579368a0cd84425bb597c35b812d03b22aab8;hpb=831c82c9a869cdb8beb678c7a52568568ef87129;p=dsa-puppet.git

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 12d57936..8c39f290 100644
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,6 +10,10 @@
   # Make sure that the srm.conf directive is commented out.
   AddDefaultCharSet Off
   AllowOverride AuthConfig FileInfo
+  <% if @lsbmajdistrelease > '7' -%>
+    Require all granted
+  <% end -%>
+
 
   # Serve icons as image/x-icon
   AddType image/x-icon .ico
@@ -137,8 +141,8 @@
    DocumentRoot <%= wwwdo_document_root %>/
    ErrorLog /var/log/apache2/www-other.debian.org-error.log
    CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
-   RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
-   RewriteLogLevel 1
+   #RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
+   #RewriteLogLevel 1
 
    RewriteEngine on
    RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]