Browse Source

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
Clark Boylan 4 months ago
parent
commit
073ef439a7
1 changed files with 1 additions and 1 deletions
  1. 1
    1
      templates/dual-elasticsearch.vhost.erb

+ 1
- 1
templates/dual-elasticsearch.vhost.erb View File

@@ -1,6 +1,6 @@
1 1
 <VirtualHost *:80>
2 2
   ServerName <%= @vhost_name %>
3
-  ServerAdmin <%= @serveradmin %>
3
+  ServerAdmin <%= scope.lookupvar('::kibana::js::serveradmin') %>
4 4
 <% if @serveraliases.is_a? Array %>
5 5
 <% @serveraliases.each do |name| %><%= "  ServerAlias #{name}\n" %><% end %>
6 6
 <% elsif ! ['', nil].include?(@serveraliases) %>

Loading…
Cancel
Save