remove double slashes on metadata.ftp-master.debian.org

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / vhost / static-vhosts-simple.erb

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 0ed8409..738ad3a 100644 (file)
--- 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
@@ -137,12 +142,13 @@ def vhost(lines, sn, kwargs={})
 end
 
 lines = []
-vhost(lines, "mozilla.debian.net")
+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)