support https vhosts without redirects

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..0ed8409 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