From b22126f6fb34f763cbcee4ad49b988947ecd1bf7 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 27 May 2016 01:32:44 +0200
Subject: [PATCH] HTTPS for www.ports.debian.org

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 modules/roles/manifests/static_mirror.pp                  | 1 +
 .../static-mirroring/vhost/static-vhosts-simple.erb       | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index bff5335a2..55379a1bb 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -81,6 +81,7 @@ class roles::static_mirror {
 	ssl::service { 'd-i.debian.org'      : ensure => "ifstatic", notify => Service['apache2'], }
 
 	ssl::service { 'backports.debian.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
+	ssl::service { 'www.ports.debian.org'  : ensure => "ifstatic", notify => Service['apache2'], key => true, }
 	ssl::service { 'news.debian.net'       : ensure => "ifstatic", notify => Service['apache2'], key => true, }
 	ssl::service { 'debaday.debian.net'    : ensure => "ifstatic", notify => Service['apache2'], key => true, }
 	ssl::service { 'timeline.debian.net'   : ensure => "ifstatic", notify => Service['apache2'], key => true, }
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 3feff61d8..04691c5a1 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -131,7 +131,10 @@ lines.join("\n")
 ######################
 # www.ports.debian.org
 <% if scope.function_has_static_component(['www.ports.debian.org']) -%>
-<Virtualhost <%= vhost_listen %> >
+
+Use common-dsa-vhost-https-redirect www.ports.debian.org
+
+<Virtualhost <%= vhost_listen_443 %> >
 	ServerName www.ports.debian.org
 	ServerAlias www.ports-backend.debian.org
 	ServerAdmin debian-admin@lists.debian.org
@@ -139,6 +142,9 @@ lines.join("\n")
 	ErrorLog /var/log/apache2/www.ports.debian.org-error.log
 	CustomLog /var/log/apache2/www.ports.debian.org-access.log privacy
 
+	Use common-debian-service-ssl $name
+	Use common-ssl-HSTS
+
 	<IfModule mod_userdir.c>
 		UserDir disabled
 	</IfModule>
-- 
2.20.1