From b298b82332178e5931bdca93eb540ea07f49974c Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2016 18:12:14 +0000
Subject: [PATCH] move bits to a default with extra

---
 .../vhost/static-vhosts-simple.erb            | 44 ++++---------------
 1 file changed, 8 insertions(+), 36 deletions(-)

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 834c5d992..f2f5a28d9 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -15,6 +15,12 @@
 	ServerAlias network-test-backend.debian.org
 </Macro>
 
+<Macro vhost-bits.debian.org-extra>
+	<IfModule mod_geoip.c>
+		CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
+	</IfModule>
+</Macro>
+
 <%=
 
 def vhost(lines, sn, type=nil)
@@ -47,6 +53,8 @@ vhost(lines, "appstream.debian.org", "ssl")
 vhost(lines, "dsa.debian.org"      , "ssl")
 vhost(lines, "rtc.debian.org"      , "ssl")
 
+vhost(lines, "bits.debian.org", "ssl-with-extra")
+
 vhost(lines, "10years.debconf.org" , "ssl")
 vhost(lines, "debconf0.debconf.org", "ssl")
 vhost(lines, "debconf1.debconf.org", "ssl")
@@ -83,42 +91,6 @@ lines.join("\n")
 </VirtualHost>
 <% end -%>
 
-######################
-# bits.debian.org
-<% if scope.function_has_static_component(['bits.debian.org']) -%>
-<Macro static-bits.debian.org-base>
-	ServerName bits.debian.org
-	ServerAdmin debian-admin@lists.debian.org
-
-	ErrorLog /var/log/apache2/bits.debian.org-error.log
-	<IfModule mod_geoip.c>
-		CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
-	</IfModule>
-
-	Use common-static-base bits.debian.org
-</Macro>
-
-<Virtualhost <%= vhost_listen %> >
-	RewriteEngine on
-
-	RewriteEngine On
-	RewriteCond %{REQUEST_URI} !^/feeds/
-	RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R,L]
-	#RewriteRule ^/(.*)$ https://bits.debian.org/$1 [R=301,L]
-
-	Use static-bits.debian.org-base
-	CustomLog /var/log/apache2/bits.debian.org-access.log privacy
-</VirtualHost>
-
-<Virtualhost <%= vhost_listen_443 %> >
-	Use static-bits.debian.org-base
-	CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
-
-	Use common-debian-service-ssl bits.debian.org
-	Use common-ssl-HSTS
-</VirtualHost>
-<% end -%>
-
 ######################
 # release.debian.org
 <% if scope.function_has_static_component(['release.debian.org']) -%>
-- 
2.20.1