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=79531d2806cccc85a44d49b23f6c1304d2763198;hpb=06db43bd308fe7bb359f200149ed173985fc0232;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 79531d28..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,7 +2,9 @@
 
 Use common-static-vhost mozilla.debian.net
 Use common-static-vhost backports.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"
@@ -28,6 +30,13 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 </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>
@@ -37,7 +46,7 @@ Use common-static-vhost-with-extra security-team.debian.org "ServerAlias securit
 	CustomLog /var/log/apache2/bits.debian.org-access.log privacyssl
 
 	Use common-debian-service-ssl bits.debian.org
-	# Use common-ssl-HSTS
+	Use common-ssl-HSTS
 </VirtualHost>
 
 # www.backports.org