X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsalsa%2Ftemplates%2Fapache-pages.debian.net.conf.erb;h=0f849ed0ad069c95cacde0c982ff41358c5a60c3;hb=839c8ea25d94aa887d71e46d150509ff4c339fac;hp=a39f4d69f8bfa9a17bf613c729632cbd0664d040;hpb=35be420f1c3287c816a8e05e395e145dc84b78fb;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
+
+ 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]
+
ServerName pages.debian.net