From e153f78bcd0ca9feb0abbb49b6f520ec3e8d0ce9 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 27 Aug 2016 18:34:52 +0200 Subject: [PATCH] support https vhosts without redirects --- .../static-mirroring/vhost/static-vhosts-simple.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 75a446ef8..0ed840921 100644 --- 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 -- 2.20.1