From cfd20318446f1a3b31e507d41534e9334c526b32 Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Thu, 13 Mar 2014 21:02:58 -0700 Subject: [PATCH] Fixup logstash vhost template to use @global vars Change-Id: Ie1564aa338bf5f9c2d155da68cdb6cb8a43a9b55 --- modules/logstash/templates/logstash.vhost.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/logstash/templates/logstash.vhost.erb b/modules/logstash/templates/logstash.vhost.erb index c1e427e0e4..ef73a6a034 100644 --- a/modules/logstash/templates/logstash.vhost.erb +++ b/modules/logstash/templates/logstash.vhost.erb @@ -1,12 +1,12 @@ -:80> - ServerName <%= scope.lookupvar("::logstash::web::vhost_name") %> - ServerAdmin <%= scope.lookupvar("::logstash::web::serveradmin") %> +:80> + 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 ProxyPass / http://127.0.0.1:9292/ retry=0 ProxyPassReverse / http://127.0.0.1:9292/