X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fvhost%2Fstatic-vhosts-simple.erb;h=738ad3a115f427eebc1e559b1d47645e6d6376ae;hb=5d598f2a486bfb7619f294eeb606aa114f183349;hp=ff11890f839a1f2266c17444b06df297afff0dd8;hpb=81b77c4f373a1eb5059c92c7711f93456ef50aec;p=mirror%2Fdsa-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 ff11890f8..738ad3a11 100644
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -22,6 +22,11 @@
 </Macro>
 
 <Macro vstatic-vhost-extra-metadata.ftp-master.debian.org>
+	# Rewrite away double slashes
+	RewriteEngine on
+	RewriteCond %{THE_REQUEST} //
+	RewriteRule ^.*$ $0 [R=302,L,NE]
+
 	AddDefaultCharset utf-8
 	<LocationMatch "/changelogs/(main|contrib|non-free)">
 		ForceType text/plain
@@ -139,10 +144,11 @@ end
 lines = []
 vhost(lines, "mozilla.debian.net"            , :ssl => true, :ssl_optional => true)
 vhost(lines, "backports.debian.org"          , :ssl => true)
-vhost(lines, "incoming.debian.org")
-vhost(lines, "incoming.ports.debian.org")
-vhost(lines, "debdeltas.debian.net")
+vhost(lines, "incoming.debian.org"           , :ssl => true, :ssl_optional => true)
+vhost(lines, "incoming.ports.debian.org"     , :ssl => true, :ssl_optional => true)
+vhost(lines, "debdeltas.debian.net"          , :ssl => true, :ssl_optional => true)
 vhost(lines, "news.debian.net"               , :ssl => true)
+vhost(lines, "bootstrap.debian.net"          , :ssl => true)
 vhost(lines, "debaday.debian.net"            , :ssl => true)
 vhost(lines, "timeline.debian.net"           , :ssl => true)
 vhost(lines, "network-test.debian.org"       , :extra => true)
@@ -156,7 +162,7 @@ vhost(lines, "rtc.debian.org"                , :ssl => true)
 vhost(lines, "onion.debian.org"              , :ssl => true)
 
 vhost(lines, "bits.debian.org"               , :ssl => true, :extra => true)
-vhost(lines, "micronews.debian.net"          , :ssl => true)
+vhost(lines, "micronews.debian.org"          , :ssl => true)
 vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
 
 vhost(lines, "10years.debconf.org"           , :ssl => true)