X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fapache-cdimage-search.debian.org.conf.erb;h=eeafe393b5fabf6ddf49b0aef0be33d0bba81fcf;hb=b5e3d5c524d285965f1dee322889dadc66a068b7;hp=f6ce99173d6080736e841b66a066fa7800b9c23a;hpb=66b3b20c5d78a81cb87ae9d4c22717887cc05c8c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb b/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
index f6ce99173..eeafe393b 100644
--- a/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
+++ b/modules/roles/templates/apache-cdimage-search.debian.org.conf.erb
@@ -1,9 +1,14 @@
-<VirtualHost *:80>
+##
+### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+###
+
+<Macro vhost-inner-cdimage-search.debian.org>
 	ServerAdmin debian-cd@lists.debian.org
 	DocumentRoot /srv/cdimage-search.debian.org/htdocs
-	ServerName cdimage-search.debian.org
+
 	ErrorLog /var/log/apache2/cdimage-search.debian.org-error.log
-	CustomLog /var/log/apache2/cdimage-search.debian.org-access.log combined
+	CustomLog /var/log/apache2/cdimage-search.debian.org-access.log privacy
 
 	ScriptAlias /cgi-bin/ /srv/cdimage-search.debian.org/cgi-bin/
 	<Directory "/srv/cdimage-search.debian.org/cgi-bin">
@@ -19,6 +24,29 @@
 
 	RewriteEngine On
 	RewriteRule ^/$ /cgi-bin/find_file.cgi [PT]
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+</Macro>
+
+Use common-debian-service-https-redirect * cdimage-search.debian.org
+
+<VirtualHost *:443>
+	ServerName cdimage-search.debian.org
+	Use common-debian-service-ssl cdimage-search.debian.org
+	Use common-ssl-HSTS
+	Use http-pkp-cdimage-search.debian.org
+	Use vhost-inner-cdimage-search.debian.org
+</VirtualHost>
+
+<% if scope.function_onion_global_service_hostname(['cdimage-search.debian.org']) -%>
+<Virtualhost *:80>
+	ServerName <%= scope.function_onion_global_service_hostname(['cdimage-search.debian.org']) %>
+	Use vhost-inner-cdimage-search.debian.org
 </VirtualHost>
 
+<% end %>
+
+
 # vim:set syn=apache: