SSL for pages.debian.org

[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 e925623..aab039f 100644 (file)
--- 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