From: Julien Cristau <jcristau@debian.org>
Date: Wed, 27 Jul 2016 17:31:17 +0000 (+0200)
Subject: All www and static mirrors run jessie
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=107f559934a6ad06102b93265b8149d8fc060a34;p=mirror%2Fdsa-puppet.git

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 3442b9fce..5c9d12506 100644
--- 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 6b857fc60..ad39851f8 100644
--- 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 2bf974f50..4e45371d6 100644
--- 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 20f9298a6..8cecd35e8 100644
--- 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]