From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 23 Feb 2018 22:00:47 +0000 (+0100)
Subject: Redirect all of *.pages to https (re: RT#7072)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cf777108b9ecaae7ad6a1a4cc907526d6d22dc1b;p=mirror%2Fdsa-puppet.git

Redirect all of *.pages to https (re: RT#7072)
---

diff --git a/modules/salsa/templates/apache-pages.debian.net.conf.erb b/modules/salsa/templates/apache-pages.debian.net.conf.erb
index a39f4d69f..0f849ed0a 100644
--- a/modules/salsa/templates/apache-pages.debian.net.conf.erb
+++ b/modules/salsa/templates/apache-pages.debian.net.conf.erb
@@ -1,4 +1,14 @@
-Use common-debian-service-https-redirect * pages.debian.net
+<VirtualHost 209.87.16.45:80 [2607:f8f0:614:1::1274:45]:80>
+	ServerName pages.debian.net
+	ServerAlias *.pages.debian.net
+	ServerAdmin debian-admin@lists.debian.org
+
+	CustomLog /var/log/apache2/pages.debian.net-access.log privacy
+	ErrorLog /var/log/apache2/pages.debian.net-error.log
+
+	RewriteEngine On
+	RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+</VirtualHost>
 
 <VirtualHost 209.87.16.45:443 [2607:f8f0:614:1::1274:45]:443>
 	ServerName pages.debian.net