From 107f559934a6ad06102b93265b8149d8fc060a34 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 27 Jul 2016 19:31:17 +0200 Subject: [PATCH] All www and static mirrors run jessie Remove no longer needed apache 2.4 conditionals Signed-off-by: Julien Cristau --- modules/roles/templates/apache-www.debian.org.erb | 5 +---- .../templates/static-mirroring/static-vhost.conf.erb | 7 +------ .../static-mirroring/vhost/lintian.debian.org.erb | 4 +--- .../static-mirroring/vhost/planet.debian.org.erb | 8 +++----- 4 files changed, 6 insertions(+), 18 deletions(-) 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 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 - <% 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' -%> - - Require all granted - - <% end -%> + + Require all granted + RewriteEngine On RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC] -- 2.20.1