From d06c229268a81e3b3e74b3d835ab917eb25de506 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen.murphy@suse.de>
Date: Fri, 13 Jul 2018 15:03:41 +0200
Subject: [PATCH] Fix scope of vhost template variable

Dynamic scoping for variables in ERB templates was removed in puppet
4[1], so look up the @serveradmin variable from the scope object.

[1] https://puppet.com/docs/puppet/4.10/lang_updating_manifests.html#dynamic-scoping-in-erb

Change-Id: Ia53125bed102193e149f995430bbdf10dfdbf428
---
 templates/hound.vhost.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/hound.vhost.erb b/templates/hound.vhost.erb
index c860b63..f90b6b2 100644
--- a/templates/hound.vhost.erb
+++ b/templates/hound.vhost.erb
@@ -5,7 +5,7 @@
 <% elsif @serveraliases -%>
 <%= "  ServerAlias #{@serveraliases}" %>
 <% end %>
-  ServerAdmin <%= @serveradmin %>
+  ServerAdmin <%= scope.lookupvar("hound::serveradmin") %>
 
   ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("hound::vhost_name") %>-error.log