From 0fb8056471a7914c3173fc129d3a8b459da70bf9 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 21 May 2018 14:45:39 +1000 Subject: [PATCH] Fix ssl key lookup It seems the scope.lookupvar() doesn't work with non-global variables; use the @ syntax. This is copied from puppet-cgit Change-Id: I38eb50157d25c6c7900a8455eddedb4655c4637d --- templates/nodepool-builder.ssl.vhost.erb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/nodepool-builder.ssl.vhost.erb b/templates/nodepool-builder.ssl.vhost.erb index ddfb090..c4e9e4f 100644 --- a/templates/nodepool-builder.ssl.vhost.erb +++ b/templates/nodepool-builder.ssl.vhost.erb @@ -16,10 +16,13 @@ SSLEngine on - SSLCertificateFile <%= scope.lookupvar("nodepool::builder::ssl_cert_file") %> - SSLCertificateKeyFile <%= scope.lookupvar("nodepool::builder::ssl_key_file") %> - <% if scope.lookupvar("nodepool::builder::ssl_chain_file") != "" %> - SSLCertificateChainFile <%= scope.lookupvar("nodepool::builder::ssl_chain_file") %> + SSLCertificateFile <%= @ssl_cert_file %> + SSLCertificateKeyFile <%= @ssl_key_file %> + <%# The original default was '' -%> + <%# scope.lookupvar returns nil for an undefined variable in puppet 4 -%> + <%# scope.lookupvar returns :undef for an undefined variable in puppet 3 -%> + <% unless ['', nil, :undef].include?@ssl_chain_file %> + SSLCertificateChainFile <%= @ssl_chain_file %> <% end %> DocumentRoot <%= scope.lookupvar("nodepool::builder::build_log_document_root") %>