From 073ef439a7bde1ada1ddc34fc407dd28abddde94 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 14 Dec 2018 15:40:03 -0800 Subject: [PATCH] Use full lookup path for serveradmin in template The last change was incomplete bceause we evaluate the apache conf template in the context of the httpd class meaning any vars outside of that class must be fully qualified lookups. Make serveradmin a fully qualified lookup. Change-Id: I709af6a78316cd1ca7e489d62f13e988997f3157 --- templates/dual-elasticsearch.vhost.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/dual-elasticsearch.vhost.erb b/templates/dual-elasticsearch.vhost.erb index 6f75740..27c7c3b 100644 --- a/templates/dual-elasticsearch.vhost.erb +++ b/templates/dual-elasticsearch.vhost.erb @@ -1,6 +1,6 @@ ServerName <%= @vhost_name %> - ServerAdmin <%= @serveradmin %> + ServerAdmin <%= scope.lookupvar('::kibana::js::serveradmin') %> <% if @serveraliases.is_a? Array %> <% @serveraliases.each do |name| %><%= " ServerAlias #{name}\n" %><% end %> <% elsif ! ['', nil].include?(@serveraliases) %>