From 5e6d9dff0b2445ea867131e13d7a793cd8649e48 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 22 Jul 2014 21:42:47 +0200
Subject: [PATCH] Move lintian to https

---
 .../templates/static-mirroring/static-vhost.conf.erb | 12 ++++++++++++
 .../static-mirroring/vhost/lintian.debian.org.erb    | 10 ++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index 58cfb1d8..1b1137d4 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -11,6 +11,18 @@
 	</VirtualHost>
 </Macro>
 
+<Macro common-dsa-vhost-https-redirect-temp $name>
+	<VirtualHost <%= vhost_listen %> >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		CustomLog /var/log/apache2/$name-access.log privacy
+		ErrorLog /var/log/apache2/$name-error.log
+
+		Redirect / https://$name/
+	</VirtualHost>
+</Macro>
+
 <Macro common-static-base $name>
 	<IfModule mod_userdir.c>
 		UserDir disabled
diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
index 2d112f23..7d97eeee 100644
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
@@ -1,9 +1,15 @@
-<Virtualhost <%= vhost_listen %> >
+Use common-dsa-vhost-https-redirect-temp lintian.debian.org
+Use common-dsa-vhost-https-redirect lintian.debian.org
+
+<Virtualhost <%= vhost_listen_443 %> >
 	ServerName lintian.debian.org
 	ServerAdmin lintian-maint@debian.org
 
 	ErrorLog /var/log/apache2/lintian.debian.org-error.log
-	CustomLog /var/log/apache2/lintian.debian.org-access.log privacy
+	CustomLog /var/log/apache2/lintian.debian.org-access.log privacyssl
+
+	Use common-debian-service-ssl lintian.debian.org
+	#Use common-ssl-HSTS
 
 	<IfModule mod_userdir.c>
 		UserDir disabled
-- 
2.39.2