X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsalsa%2Ftemplates%2Fapache-pages.debian.net.conf.erb;fp=modules%2Fsalsa%2Ftemplates%2Fapache-pages.debian.net.conf.erb;h=0f849ed0ad069c95cacde0c982ff41358c5a60c3;hb=76ca91bce24ecbcbcc4e62a37aa06fd0fb9f96c7;hp=a39f4d69f8bfa9a17bf613c729632cbd0664d040;hpb=46cee04ab06b23ab6e9e4baba655cf470d10cfc4;p=mirror%2Fdsa-puppet.git

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