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=7c99f652ebf7260cf326e6f956f0a46704718bef;hpb=7997b09aa6fcd6bb60ed9b82b1bce4247589a187;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 7c99f652e..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
@@ -119,7 +124,10 @@ def vhost(lines, sn, kwargs={})
 
 		lines << "Use prepare-static-vhost #{sn}"
 
-		if kwargs[:ssl]
+		if kwargs[:ssl] and kwargs[:ssl_optional]
+			lines << "Use static-vhost-plain-#{sn}"
+			lines << "Use static-vhost-ssl-#{sn}"
+		elsif kwargs[:ssl]
 			lines << "Use common-dsa-vhost-https-redirect #{sn}"
 			lines << "Use static-vhost-ssl-#{sn}"
 		else
@@ -134,46 +142,47 @@ def vhost(lines, sn, kwargs={})
 end
 
 lines = []
-vhost(lines, "mozilla.debian.net")
-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, "news.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)
-vhost(lines, "blends.debian.org"       , :ssl => true)
-vhost(lines, "wnpp-by-tags.debian.net" , :ssl => true)
-vhost(lines, "security-team.debian.org", :ssl => true)
-vhost(lines, "d-i.debian.org"      , :ssl => true)
-vhost(lines, "appstream.debian.org", :ssl => true)
-vhost(lines, "dsa.debian.org"      , :ssl => true)
-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, "mozilla.debian.net"            , :ssl => true, :ssl_optional => true)
+vhost(lines, "backports.debian.org"          , :ssl => true)
+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)
+vhost(lines, "blends.debian.org"             , :ssl => true)
+vhost(lines, "wnpp-by-tags.debian.net"       , :ssl => true)
+vhost(lines, "security-team.debian.org"      , :ssl => true)
+vhost(lines, "d-i.debian.org"                , :ssl => true)
+vhost(lines, "appstream.debian.org"          , :ssl => true)
+vhost(lines, "dsa.debian.org"                , :ssl => true)
+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.org"          , :ssl => true)
 vhost(lines, "metadata.ftp-master.debian.org", :extra => true)
 
-vhost(lines, "10years.debconf.org" , :ssl => true)
-vhost(lines, "debconf0.debconf.org", :ssl => true)
-vhost(lines, "debconf1.debconf.org", :ssl => true)
-vhost(lines, "debconf2.debconf.org", :ssl => true)
-vhost(lines, "debconf3.debconf.org", :ssl => true)
-vhost(lines, "debconf4.debconf.org", :ssl => true)
-vhost(lines, "debconf5.debconf.org", :ssl => true)
-vhost(lines, "debconf6.debconf.org", :ssl => true)
-vhost(lines, "debconf7.debconf.org", :ssl => true)
-vhost(lines, "debconf16.debconf.org", :ssl => true)
-vhost(lines, "es.debconf.org"      , :ssl => true)
-vhost(lines, "fr.debconf.org"      , :ssl => true)
-vhost(lines, "miniconf10.debconf.org" , :ssl => true)
-
-vhost(lines, "deb.debian.org", :extra => true)
-vhost(lines, "release.debian.org", :ssl => true, :extra => true)
-vhost(lines, "www.ports.debian.org", :ssl => true, :extra => true)
-vhost(lines, "lintian.debian.org", :ssl => true, :extra => true)
+vhost(lines, "10years.debconf.org"           , :ssl => true)
+vhost(lines, "debconf0.debconf.org"          , :ssl => true)
+vhost(lines, "debconf1.debconf.org"          , :ssl => true)
+vhost(lines, "debconf2.debconf.org"          , :ssl => true)
+vhost(lines, "debconf3.debconf.org"          , :ssl => true)
+vhost(lines, "debconf4.debconf.org"          , :ssl => true)
+vhost(lines, "debconf5.debconf.org"          , :ssl => true)
+vhost(lines, "debconf6.debconf.org"          , :ssl => true)
+vhost(lines, "debconf7.debconf.org"          , :ssl => true)
+vhost(lines, "debconf16.debconf.org"         , :ssl => true)
+vhost(lines, "es.debconf.org"                , :ssl => true)
+vhost(lines, "fr.debconf.org"                , :ssl => true)
+vhost(lines, "miniconf10.debconf.org"        , :ssl => true)
+
+vhost(lines, "deb.debian.org"                , :extra => true)
+vhost(lines, "release.debian.org"            , :ssl => true, :extra => true)
+vhost(lines, "www.ports.debian.org"          , :ssl => true, :extra => true)
+vhost(lines, "lintian.debian.org"            , :ssl => true, :extra => true)
 
 lines.join("\n")
 -%>