From ae988eccef3b4679c96bb8a6ea11baaab44f9bc6 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 31 Dec 2017 13:50:37 +0100 Subject: [PATCH] Use separate static component for planet.d.n vhost (rt#7018) --- .../templates/static-mirroring/vhost/planet.debian.org.erb | 6 +----- .../static-mirroring/vhost/static-vhosts-simple.erb | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) 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 a46871eb0..f76b693f9 100644 --- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb +++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb @@ -18,17 +18,13 @@ > ServerName planet.debian.org - ServerAlias planet.debian.net planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org + ServerAlias planet-backend.debian.org planet-fastly.debian.org planet-maxcdn.debian.org <% if scope.function_onion_global_service_hostname(['planet.debian.org']) -%> ServerAlias <%= scope.function_onion_global_service_hostname(['planet.debian.org']) %> <% end %> CustomLog /var/log/apache2/planet.debian.org-access.log privacy Use common-planet.d.o - - RewriteEngine On - RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC] - RewriteRule ^/(.*) https://planet.debian.org/$1 [R=permanent,L] > 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 dedb06983..43dcd6550 100644 --- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb +++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb @@ -212,6 +212,7 @@ vhost(lines, "rtc.debian.org" , :ssl => true) vhost(lines, "mirror-master.debian.org" , :ssl => true) vhost(lines, "onion.debian.org" , :ssl => true) vhost(lines, "manpages.debian.org" , :ssl => true, :extra => true) +vhost(lines, "planet.debian.net") vhost(lines, "bits.debian.org" , :ssl => true, :extra => true) vhost(lines, "micronews.debian.org" , :ssl => true) -- 2.20.1