From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 27 Aug 2016 16:34:52 +0000 (+0200)
Subject: support https vhosts without redirects
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e153f78bcd0ca9feb0abbb49b6f520ec3e8d0ce9;p=mirror%2Fdsa-puppet.git

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 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