All www and static mirrors run jessie

Remove no longer needed apache 2.4 conditionals

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 3442b9f..5c9d125 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -10,10 +10,7 @@
   # Make sure that the srm.conf directive is commented out.
   AddDefaultCharSet Off
   AllowOverride AuthConfig FileInfo
-  <% if @lsbmajdistrelease > '7' -%>
-    Require all granted
-  <% end -%>
-
+  Require all granted
 
   # Serve icons as image/x-icon
   AddType image/x-icon .ico

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 6b857fc..ad39851 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -34,12 +34,7 @@
                AllowOverride FileInfo Indexes Options=Multiviews
                Options Indexes SymLinksIfOwnerMatch
                IndexOptions FancyIndexing NameWidth=*
-               <% if @lsbmajdistrelease > '7' -%>
-                       Require all granted
-               <% else -%>
-                       Order allow,deny
-                       Allow from all
-               <% end -%>
+               Require all granted
        </Directory>
 
        Header set Surrogate-Key <%= hostname %>

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 2bf974f..4e45371 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,9 +20,7 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
        AddDefaultCharset utf-8
 
        <Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
-               <% if @lsbmajdistrelease > '7' -%>
-                       Require all granted
-               <% end -%>
+               Require all granted
 
                # These three lines makes apache serve
                # "lintian.log.gz" as a text/plain with encoding gzip

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 20f9298..8cecd35 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -14,11 +14,9 @@
 
        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 -%>
+       <Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
+               Require all granted
+       </Directory>
 
        RewriteEngine On
        RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]