Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / salsa / templates / apache-pages.debian.net.conf.erb

diff --git a/modules/salsa/templates/apache-pages.debian.net.conf.erb b/modules/salsa/templates/apache-pages.debian.net.conf.erb
index a39f4d6..0f849ed 100644 (file)
--- 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