bits.d.o: redirect everything but /feeds to https

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 79531d2806cccc85a44d49b23f6c1304d2763198..2e0ed8c1273884644641ccc5b5baeae2575bbd1f 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -28,6 +28,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 [NC,R=301,L]
+
        Use static-bits.debian.org-base
        CustomLog /var/log/apache2/bits.debian.org-access.log privacy
 </VirtualHost>