mirror_debug -> debug_mirror

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 e10c2f1..983264e 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -59,6 +59,7 @@ vhost(lines, "d-i.debian.org"      , "ssl")
 vhost(lines, "appstream.debian.org", "ssl")
 vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")
+vhost(lines, "onion.debian.org"    , "ssl")
 
 vhost(lines, "bits.debian.org", "ssl-with-extra")
 vhost(lines, "metadata.ftp-master.debian.org", "with-extra")
@@ -85,16 +86,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 +117,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