From f5843fa9ce051be9d829df7d3d577481b0a2b9c9 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Fri, 10 Nov 2017 23:12:54 +0100
Subject: [PATCH] add ssl vhost for planet-backend

---
 modules/roles/manifests/static_mirror.pp      |  1 +
 .../vhost/planet.debian.org.erb               | 26 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 1a754f9ac..ddc497c00 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -103,6 +103,7 @@ class roles::static_mirror {
 	ssl::service { 'manpages.debian.org'           : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'mirror-master.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'onion.debian.org'              : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
+	ssl::service { 'planet-backend.debian.org'     : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'release.debian.org'            : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
 	ssl::service { 'rtc.debian.org'                : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true }
 	ssl::service { 'security-team.debian.org'      : ensure => "ifstatic", notify  => Exec['service apache2 reload'], key => true, }
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 9dca69c6e..1f45252bf 100644
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -1,11 +1,6 @@
 <% if scope.function_has_static_component(['planet.debian.org']) -%>
 
-<Virtualhost <%= @vhost_listen %> >
-	ServerName planet.debian.org
-	ServerAlias planet.debian.net planeta.debian.net 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 %>
+<Macro common-planet.d.o>
 	ServerAdmin planet@debian.org
 
 	ErrorLog /var/log/apache2/planet.debian.org-error.log
@@ -20,6 +15,16 @@
 	<Directory /srv/static.debian.org/mirrors/planet.debian.org/cur>
 		Require all granted
 	</Directory>
+</Macro>
+
+<Virtualhost <%= @vhost_listen %> >
+	ServerName planet.debian.org
+	ServerAlias planet.debian.net planeta.debian.net 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 %>
+
+	Use common-planet.d.o
 
 	RewriteEngine On
 	RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
@@ -27,6 +32,15 @@
 	RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC]
 	RewriteRule ^/(.*)        http://planet.debian.org/$1  [R=permanent,L]
 </VirtualHost>
+
+<VirtualHost <%= @vhost_listen_443 %> >
+	ServerName planet-backend.debian.org
+
+	Use common-debian-service-ssl planet-backend.debian.org
+	Use common-planet.d.o
+
+</VirtualHost>
+
 <% end -%>
 
 # vim:set syn=apache:
-- 
2.20.1