From 06db43bd308fe7bb359f200149ed173985fc0232 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 22 Jul 2014 21:17:00 +0200
Subject: [PATCH] More complex bits.debian.org config

---
 .../static-mirroring/static-vhost.conf.erb    | 15 ----------
 .../vhost/static-vhosts-simple.erb            | 29 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/modules/roles/templates/static-mirroring/static-vhost.conf.erb b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
index e398e5bf..5e3fe41d 100644
--- a/modules/roles/templates/static-mirroring/static-vhost.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-vhost.conf.erb
@@ -32,21 +32,6 @@
 	</VirtualHost>
 </Macro>
 
-<Macro common-static-vhost-publiclog $name>
-	<Virtualhost <%= vhost_listen %> >
-		ServerName $name
-		ServerAdmin debian-admin@lists.debian.org
-
-		ErrorLog /var/log/apache2/$name-error.log
-		CustomLog /var/log/apache2/$name-access.log privacy
-		<IfModule mod_geoip.c>
-			CustomLog /var/log/apache2/$name-public-access.log privacy+geo
-		</IfModule>
-
-		Use common-static-base $name
-	</VirtualHost>
-</Macro>
-
 <Macro common-static-vhost $name>
 	Use common-static-vhost-with-extra $name "# nada"
 </Macro>
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 cbf4c6bf..79531d28 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -2,7 +2,6 @@
 
 Use common-static-vhost mozilla.debian.net
 Use common-static-vhost backports.debian.org
-Use common-static-vhost-publiclog bits.debian.org
 Use common-static-vhost news.debian.net
 Use common-static-vhost-with-extra metadata.ftp-master.debian.org "AddDefaultCharset utf-8"
 Use common-static-vhost-with-extra d-i.debian.org "ServerAlias d-i-backend.debian.org"
@@ -13,6 +12,34 @@ Use common-static-vhost-ssl dsa.debian.org
 Use common-static-vhost-ssl rtc.debian.org
 Use common-static-vhost-with-extra security-team.debian.org "ServerAlias security-team-backend.debian.org"
 
+
+# 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 %> >
+	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>
+
 # www.backports.org
 ###################
 # www.backports.org is the historical place for the backports
-- 
2.39.2