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=12a4f16529b1313f292e1a751ed06496b3373245;hpb=c02bca2103152bc3054ba474242a33f61b02dfd9;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 12a4f1652..89a74d0f7 100644
--- a/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/lintian.debian.org.erb
@@ -1,15 +1,13 @@
+<% if scope.function_has_static_component(['lintian.debian.org']) -%>
+
 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>
@@ -18,7 +16,10 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
 	AddDefaultCharset utf-8
 
 	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur>
-		# These two lines makes apache serve "lintian.log.gz" as a text/plain with encoding gzip
+		Require all granted
+
+		# These three lines makes apache serve
+		# "lintian.log.gz" as a text/plain with encoding gzip
 		# making it easier to view the log in the browser.
 		RemoveType .gz
 		AddEncoding x-gzip .gz
@@ -30,12 +31,6 @@ Use common-dsa-vhost-https-redirect lintian.debian.org
 		</IfModule>
 	</Directory>
 
-	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/graphs>
-		# Cache graphs for an hour (Technically, a "expires" of "24h after last mod"
-		# might be better, but oh well)
-		Header set Cache-Control "max-age=3600, must-revalidate, public"
-	</Directory>
-
 	<Directory /srv/static.debian.org/mirrors/lintian.debian.org/cur/resources>
 		# Cache these for a year (3600 * 24 * 365.25)
 		# Files in here will change name if their content change
@@ -55,5 +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: