ssl for debdetlta.d.n and incoming.d.o and incoming.ports.d.o

[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 75a446e..52a29b7 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -119,7 +119,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,11 +137,11 @@ 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)
 vhost(lines, "news.debian.net"               , :ssl => true)
 vhost(lines, "debaday.debian.net"            , :ssl => true)
 vhost(lines, "timeline.debian.net"           , :ssl => true)