onion for lintian

diff --git a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
index 4e45371..89a74d0 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
@@ -2,16 +2,12 @@
 
 Use common-dsa-vhost-https-redirect lintian.debian.org
 
-<Virtualhost <%= vhost_listen_443 %> >
-       ServerName lintian.debian.org
+<Macro vhost-inner-lintian.debian.org>
        ServerAdmin lintian-maint@debian.org
 
        ErrorLog /var/log/apache2/lintian.debian.org-error.log
        CustomLog /var/log/apache2/lintian.debian.org-access.log privacyssl
 
-       Use common-debian-service-ssl lintian.debian.org
-       Use common-ssl-HSTS
-
        <IfModule mod_userdir.c>
                UserDir disabled
        </IfModule>
@@ -54,7 +50,22 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
        RewriteRule ^/source/([a-z0-9-]+)/?$ /${source-map:$1} [L,R,NE]
        # Versioned request
        RewriteRule ^/source/([a-z0-9-]+)/([a-zA-Z0-9.+:~-]+)$ /${source-map:$1/$2} [L,R,NE]
+</Macro>
+
+<Virtualhost <%= vhost_listen_443 %> >
+       ServerName lintian.debian.org
+       Use common-debian-service-ssl lintian.debian.org
+       Use common-ssl-HSTS
+
+       Use vhost-inner-lintian.debian.org
+</VirtualHost>
+
+<% if scope.function_onion_global_service_hostname(['lintian.debian.org']) -%>
+<Virtualhost <%= vhost_listen %> >
+       ServerName <%= scope.function_onion_global_service_hostname(['lintian.debian.org']) %>
+       Use vhost-inner-lintian.debian.org
 </VirtualHost>
+<% end %>
 <% end -%>
 
 # vim:set syn=apache: