more apache migrations

diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
index 12a4f16..cc462ba 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
@@ -20,6 +20,10 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
        <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
                # These two lines makes apache serve "lintian.log.gz" as a text/plain with encoding gzip
                # making it easier to view the log in the browser.
+               <% if @lsbmajdistrelease > '7' -%>
+                       Require all granted
+               <% end -%>
+
                RemoveType .gz
                AddEncoding x-gzip .gz
                AddType text/plain .log

diff --git a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
index 375dd8b..758771c 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -12,6 +12,11 @@
 
        DocumentRoot /srv/static.debian.org/mirrors/planet.debian.org/cur
        AddDefaultCharset utf-8
+       <% if @lsbmajdistrelease > '7' -%>
+               <Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+                       Require all granted
+               </Directory>
+       <% end -%>
 
        RewriteEngine On
        RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 498677c..b6dec11 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -85,8 +85,12 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Multiviews Indexes FollowSymLinks Includes
                IndexOptions FancyIndexing NameWidth=*
-               Order allow,deny
-               Allow from all
+               <% if @lsbmajdistrelease > '7' -%>
+                       Require all granted
+               <% else -%>
+                       Order allow,deny
+                       Allow from all
+               <% end -%>
        </Directory>
 
        DefaultType text/plain