From efba033351d6a8274e7eec6a064e68d3150a78c4 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Thu, 26 Apr 2018 21:48:00 +0200
Subject: [PATCH] Use instance variables in puppet template

Using local ruby variables in puppet ERB templates was deprecated in
puppet 3 and doesn't work any more in puppet 4. Access these values as
ruby instance variables instead.

Change-Id: I06bdd6f5b1f13c4970c5e3e9dc8be4cf8d919b03
---
 templates/dual-elasticsearch.vhost.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/dual-elasticsearch.vhost.erb b/templates/dual-elasticsearch.vhost.erb
index 3f6ef0a..951d5c6 100644
--- a/templates/dual-elasticsearch.vhost.erb
+++ b/templates/dual-elasticsearch.vhost.erb
@@ -2,9 +2,9 @@
   ServerName <%= @vhost_name %>
   ServerAdmin <%= @serveradmin %>
 <% if @serveraliases.is_a? Array %>
-<% serveraliases.each do |name| %><%= "  ServerAlias #{name}\n" %><% end %>
+<% @serveraliases.each do |name| %><%= "  ServerAlias #{name}\n" %><% end %>
 <% elsif @serveraliases != '' %>
-<%= "  ServerAlias #{serveraliases}" %>
+<%= "  ServerAlias #{@serveraliases}" %>
 <% end %>
 
   ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log
@@ -32,8 +32,8 @@
     ProxyPassReverse <%= @elasticsearch_prefix %> <%= @elasticsearch_url %>/
   </IfModule>
 
-  DocumentRoot <%= docroot %>
-  <Directory <%= docroot %>>
+  DocumentRoot <%= @docroot %>
+  <Directory <%= @docroot %>>
     Options -Multiviews
     <IfVersion >= 2.4>
     Require all granted