From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 18:17:55 +0000 (+0000)
Subject: onion for release
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f547f56074ec88b2900d361e435d37ddb3b9ce3f;p=mirror%2Fdsa-puppet.git

onion for release
---

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 e10c2f1bb..ef643c9c2 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -85,16 +85,14 @@ lines.join("\n")
 # release.debian.org
 <% if scope.function_has_static_component(['release.debian.org']) -%>
 Use common-dsa-vhost-https-redirect release.debian.org
-<VirtualHost <%= vhost_listen_443 %> >
-	ServerName release.debian.org
+
+<Macro vhost-inner-release.debian.org>
+
 	ServerAdmin debian-admin@debian.org
 
 	ErrorLog /var/log/apache2/release.debian.org-error.log
 	CustomLog /var/log/apache2/release.debian.org-access.log privacy
 
-	Use common-debian-service-ssl release.debian.org
-	Use common-ssl-HSTS
-
 	Use common-static-base release.debian.org
 
 	RewriteEngine	on
@@ -118,7 +116,21 @@ Use common-dsa-vhost-https-redirect release.debian.org
 			ForceType text/plain
 		</Files>
 	</Directory>
+</Macro>
+
+<VirtualHost <%= vhost_listen_443 %> >
+	ServerName release.debian.org
+	Use common-debian-service-ssl release.debian.org
+	Use common-ssl-HSTS
+	Use vhost-inner-release.debian.org
 </VirtualHost>
+<% if scope.function_onion_global_service_hostname(['release.debian.org']) -%>
+<Virtualhost <%= vhost_listen %> >
+	ServerName <%= scope.function_onion_global_service_hostname(['release.debian.org']) %>
+	Use vhost-inner-release.debian.org
+</VirtualHost>
+<% end -%>
+
 <% end -%>
 
 # www.backports.org