From: Julien Cristau <jcristau@debian.org>
Date: Sun, 31 Dec 2017 12:50:37 +0000 (+0100)
Subject: Use separate static component for planet.d.n vhost (rt#7018)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ae988eccef3b4679c96bb8a6ea11baaab44f9bc6;p=mirror%2Fdsa-puppet.git

Use separate static component for planet.d.n vhost (rt#7018)
---

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 @@
 
 <Virtualhost <%= @vhost_listen %> >
 	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]
 </VirtualHost>
 
 <VirtualHost <%= @vhost_listen_443 %> >
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)