X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=498677c6fa5634fca7194f07b60f47d304e631b9;hb=3a9af9163cb5c8ba3253f498c56bf656cbaf1517;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..498677c6 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -2,8 +2,9 @@
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 incoming.debian.org
Use common-static-vhost news.debian.net
+Use common-static-vhost debaday.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"
Use common-static-vhost-with-extra network-test.debian.org "ServerAlias network-test-backend.debian.org"
@@ -13,6 +14,41 @@ 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
+######################
+
+ ServerName bits.debian.org
+ ServerAdmin debian-admin@lists.debian.org
+
+ ErrorLog /var/log/apache2/bits.debian.org-error.log
+
+ CustomLog /var/log/apache2/bits.debian.org-public-access.log privacy+geo
+
+
+ Use common-static-base bits.debian.org
+
+
+ >
+ 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
+
+
+ >
+ 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
+
+
# www.backports.org
###################
# www.backports.org is the historical place for the backports