From 14a6ec4c998d75cd2257eab41628411b3616e60a Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Sat, 7 Feb 2015 06:08:56 -0800
Subject: [PATCH] Modernize kibana vhost template

In the past it was common to do scope.lookupvar but now it is only
required when explicitly grabbing a different scope. All the
variables in kibana.vhost.erb are available from the class that
calls the template() function.

Change-Id: I100bb764b5742b1f3068e5b86813c825f9f71868
---
 templates/kibana.vhost.erb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/kibana.vhost.erb b/templates/kibana.vhost.erb
index 786f358..8648f74 100644
--- a/templates/kibana.vhost.erb
+++ b/templates/kibana.vhost.erb
@@ -1,12 +1,12 @@
 <VirtualHost *:80>
-  ServerName <%= scope.lookupvar("::logstash::web::vhost_name") %>
-  ServerAdmin <%= scope.lookupvar("::logstash::web::serveradmin") %>
+  ServerName <%= @vhost_name %>
+  ServerAdmin <%= @serveradmin %>
 
-  ErrorLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::logstash::web::vhost_name") %>-error.log
+  ErrorLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-error.log
 
   LogLevel warn
 
-  CustomLog ${APACHE_LOG_DIR}/<%= scope.lookupvar("::logstash::web::vhost_name") %>-access.log combined
+  CustomLog ${APACHE_LOG_DIR}/<%= @vhost_name %>-access.log combined
 
   <IfModule mod_proxy.c>
     <% if @proxy_elasticsearch == true %>
@@ -14,15 +14,15 @@
     # .*/_mapping, .*/_mapping/field/.*, _cluster/health, and _nodes.
     RewriteEngine on
     RewriteCond %{REQUEST_METHOD} GET
-    RewriteRule ^/elasticsearch/((.*/)?_aliases|(.*/)?_status|(.*/)?_search|(.*/)?_mapping|(.*/)?_mapping/field/(.*)?|_cluster/health|_nodes)$ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1 [P]
+    RewriteRule ^/elasticsearch/((.*/)?_aliases|(.*/)?_status|(.*/)?_search|(.*/)?_mapping|(.*/)?_mapping/field/(.*)?|_cluster/health|_nodes)$ http://<%= @discover_nodes[0] %>/$1 [P]
     RewriteCond %{REQUEST_METHOD} POST
-    RewriteRule ^/elasticsearch/(_aliases|(.*/)?_search)$ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1 [P]
+    RewriteRule ^/elasticsearch/(_aliases|(.*/)?_search)$ http://<%= @discover_nodes[0] %>/$1 [P]
     RewriteCond %{REQUEST_METHOD} OPTIONS
-    RewriteRule ^/elasticsearch/((.*/)?_search)$ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/$1 [P]
-    <Proxy http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/>
+    RewriteRule ^/elasticsearch/((.*/)?_search)$ http://<%= @discover_nodes[0] %>/$1 [P]
+    <Proxy http://<%= @discover_nodes[0] %>/>
       ProxySet connectiontimeout=15 timeout=120
     </Proxy>
-    ProxyPassReverse /elasticsearch/ http://<%= scope.lookupvar("::logstash::web::discover_nodes")[0] %>/
+    ProxyPassReverse /elasticsearch/ http://<%= @discover_nodes[0] %>/
     <% end %>
 
     ProxyPass / http://127.0.0.1:5601/ retry=0