From 275487c062170f8376dc08021cca3220612b22c4 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 1 May 2015 12:39:55 +0200 Subject: [PATCH] more apache migrations --- .../static-mirroring/vhost/lintian.debian.org.erb | 4 ++++ .../static-mirroring/vhost/planet.debian.org.erb | 5 +++++ .../static-mirroring/vhost/static-vhosts-simple.erb | 8 ++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) 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 12a4f1652..cc462ba14 100644 --- 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 # 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 375dd8bb8..758771cae 100644 --- 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' -%> + + Require all granted + + <% 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 498677c6f..b6dec113f 100644 --- 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 -%> DefaultType text/plain -- 2.20.1