From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 25 Jan 2018 21:21:56 +0000 (+0100)
Subject: SSL for pages.debian.org
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e8ec5522aaf58420f0ab025fa27cfe9967205a52;p=mirror%2Fdsa-puppet.git

SSL for pages.debian.org
---

diff --git a/modules/salsa/templates/apache-pages.debian.net.conf.erb b/modules/salsa/templates/apache-pages.debian.net.conf.erb
index e925623f7..aab039fb6 100644
--- a/modules/salsa/templates/apache-pages.debian.net.conf.erb
+++ b/modules/salsa/templates/apache-pages.debian.net.conf.erb
@@ -1,14 +1,13 @@
-#Use common-debian-service-https-redirect * XX.debian.org
+Use common-debian-service-https-redirect * pages.debian.net
 
-#<VirtualHost *:443>
-<VirtualHost *:80>
+<VirtualHost *:443>
 	ServerName pages.debian.net
 	ServerAlias *.pages.debian.net
 	ServerAdmin debian-admin@lists.debian.org
 
-	#Use common-debian-service-ssl salsa.debian.org
-	#Use common-ssl-HSTS
-	#Use http-pkp-salsa.debian.org
+	Use common-debian-service-ssl pages.debian.net
+	Use common-ssl-HSTS
+	Use http-pkp-pages.debian.net
 
 	ErrorLog /var/log/apache2/pages.debian.net-error.log
 	CustomLog /var/log/apache2/pages.debian.net-access.log privacy