From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 1 Jan 2014 16:14:56 +0000 (+0100)
Subject: Try to enable ssl for dsa.d.o
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f5006b286bd853a4224347c39898b09ce990904f;p=mirror%2Fdsa-puppet.git

Try to enable ssl for dsa.d.o
---

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index ab2bb4f8d..d9b636706 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -52,4 +52,21 @@
 </Macro>
 
 
+<Macro common-static-vhost-ssl $name>
+	Use common-debian-service-https-redirect <%= vhost_listen %> $name
+
+	<Virtualhost <%= vhost_listen %>:443 >
+		ServerName $name
+		ServerAdmin debian-admin@lists.debian.org
+
+		ErrorLog /var/log/apache2/$name-error.log
+		CustomLog /var/log/apache2/$name-access.log privacy
+
+		Use common-debian-service-ssl $name
+		Use common-ssl-HSTS
+
+		Use common-static-base $name
+	</VirtualHost>
+</Macro>
+
 # vim:ft=apache:
diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 6165aa8f6..1da1eb598 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -4,12 +4,12 @@ Use common-static-vhost mozilla.debian.net
 Use common-static-vhost backports.debian.org
 Use common-static-vhost-publiclog bits.debian.org
 Use common-static-vhost news.debian.net
-Use common-static-vhost dsa.debian.org
 Use common-static-vhost-with-extra ftp-master.metadata.debian.org "AddDefaultCharset utf-8"
 Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
 Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
 Use common-static-vhost-with-extra blends.debian.org "ServerAlias blends-backend.debian.org"
 Use common-static-vhost-with-extra wnpp-by-tags.debian.net "ServerAlias wnpp-by-tags-backend.debian.org"
+Use common-static-vhost-ssl dsa.debian.org
 
 # www.backports.org is the historical place for the backports
 # website and archive.  It is now a CNAME to backports.debian.org: