X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Flintian.debian.org.erb;h=89a74d0f7731b322c2569747e15b1aa73e45cde2;hb=c54d3c0937444eb08707008c85d9e8734448c135;hp=2bf974f502a7ee37d6f9b5d549ded2ed99633625;hpb=b6dd1254a55d3db669f9726c3ebacc9a48148b8e;p=mirror%2Fdsa-puppet.git

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 2bf974f50..89a74d0f7 100644
--- 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>
@@ -20,9 +16,7 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
 	AddDefaultCharset utf-8
 
 	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
-		<% if @lsbmajdistrelease > '7' -%>
-			Require all granted
-		<% end -%>
+		Require all granted
 
 		# These three lines makes apache serve
 		# "lintian.log.gz" as a text/plain with encoding gzip
@@ -56,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: