X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;fp=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=79531d2806cccc85a44d49b23f6c1304d2763198;hb=06db43bd308fe7bb359f200149ed173985fc0232;hp=cbf4c6bff368d242556016cd928c45f390be3988;hpb=da0708b0299bb96910822eef24feaaee5426f3c8;p=dsa-puppet.git

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