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 a46871e..f76b693 100644 (file)
--- 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 dedb069..43dcd65 100644 (file)
--- 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)