From d327d2bfe9d45c56876d835407386d8f1dc6e178 Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <jhoblitt@cpan.org>
Date: Mon, 14 Oct 2013 15:05:49 -0700
Subject: [PATCH] update erb templates to use instance variables

---
 templates/conf.php.el6.erb    |  4 ++--
 templates/gmetad.conf.el6.erb |  6 +++---
 templates/gmond.conf.el5.erb  | 16 ++++++++--------
 templates/gmond.conf.el6.erb  | 16 ++++++++--------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/templates/conf.php.el6.erb b/templates/conf.php.el6.erb
index 3d2e6c8..4659d57 100644
--- a/templates/conf.php.el6.erb
+++ b/templates/conf.php.el6.erb
@@ -41,8 +41,8 @@ $graphdir='./graph.d';
 # Although, it would be strange to alter the IP since the Round-Robin
 # databases need to be local to be read. 
 #
-$ganglia_ip = "<%= ganglia_ip %>";
-$ganglia_port = <%= ganglia_port %>;
+$ganglia_ip = "<%= @ganglia_ip %>";
+$ganglia_port = <%= @ganglia_port %>;
 
 #
 # The maximum number of dynamic graphs to display.  If you set this
diff --git a/templates/gmetad.conf.el6.erb b/templates/gmetad.conf.el6.erb
index 4782789..bf13249 100644
--- a/templates/gmetad.conf.el6.erb
+++ b/templates/gmetad.conf.el6.erb
@@ -36,7 +36,7 @@
 # data_source "my grid" 50 1.3.4.7:8655 grid.org:8651 grid-backup.org:8651
 # data_source "another source" 1.3.4.7:8655  1.3.4.8
 
-<% clusters.each do |data_source| -%>
+<% @clusters.each do |data_source| -%>
 data_source "<%= data_source['name'] -%>"<% if data_source['polling_interval'] then -%>
  <%= data_source['polling_interval'] -%>
 <%- end -%>
@@ -67,8 +67,8 @@ data_source "<%= data_source['name'] -%>"<% if data_source['polling_interval'] t
 # The name of this Grid. All the data sources above will be wrapped in a GRID
 # tag with this name.
 # default: unspecified
-<% if gridname then -%>
-gridname "<%= gridname %>"
+<% if @gridname then -%>
+gridname "<%= @gridname %>"
 <% else -%>
 # gridname "MyGrid"
 <% end -%>
diff --git a/templates/gmond.conf.el5.erb b/templates/gmond.conf.el5.erb
index da34eb5..34e78ca 100644
--- a/templates/gmond.conf.el5.erb
+++ b/templates/gmond.conf.el5.erb
@@ -17,20 +17,20 @@ globals {
  * of a <CLUSTER> tag.  If you do not specify a cluster tag, then all <HOSTS> will 
  * NOT be wrapped inside of a <CLUSTER> tag. */ 
 cluster { 
-  name = "<%= cluster_name %>"
-  owner = "<%= cluster_owner %>"
-  latlong = "<%= cluster_latlong %>"
-  url = "<%= cluster_url %>"
+  name = "<%= @cluster_name %>"
+  owner = "<%= @cluster_owner %>"
+  latlong = "<%= @cluster_latlong %>"
+  url = "<%= @cluster_url %>"
 } 
 
 /* The host section describes attributes of the host, like the location */ 
 host { 
-  location = "<%= host_location %>"
+  location = "<%= @host_location %>"
 } 
 
 /* Feel free to specify as many udp_send_channels as you like.  Gmond 
    used to only support having a single channel */ 
-<% udp_send_channel.each do |channel| -%>
+<% @udp_send_channel.each do |channel| -%>
 udp_send_channel { 
   <%- if channel['mcast_join'] then -%>
   mcast_join = <%= channel['mcast_join'] %>
@@ -48,7 +48,7 @@ udp_send_channel {
 
 <% end -%>
 /* You can specify as many udp_recv_channels as you like as well. */ 
-<% udp_recv_channel.each do |channel| -%>
+<% @udp_recv_channel.each do |channel| -%>
 udp_recv_channel { 
   <%- if channel['mcast_join'] then -%>
   mcast_join = <%= channel['mcast_join'] %>
@@ -64,7 +64,7 @@ udp_recv_channel {
 <% end -%>
 /* You can specify as many tcp_accept_channels as you like to share 
    an xml description of the state of the cluster */ 
-<% tcp_accept_channel.each do |channel| -%>
+<% @tcp_accept_channel.each do |channel| -%>
 tcp_accept_channel { 
   <%- if channel['port'] then -%>
   port       = <%= channel['port'] %>
diff --git a/templates/gmond.conf.el6.erb b/templates/gmond.conf.el6.erb
index 1c56361..85829d1 100644
--- a/templates/gmond.conf.el6.erb
+++ b/templates/gmond.conf.el6.erb
@@ -20,20 +20,20 @@ globals {
  * tag that will wrap all hosts collected by this instance.
  */
 cluster {
-  name = "<%= cluster_name %>"
-  owner = "<%= cluster_owner %>"
-  latlong = "<%= cluster_latlong %>"
-  url = "<%= cluster_url %>"
+  name = "<%= @cluster_name %>"
+  owner = "<%= @cluster_owner %>"
+  latlong = "<%= @cluster_latlong %>"
+  url = "<%= @cluster_url %>"
 }
 
 /* The host section describes attributes of the host, like the location */
 host {
-  location = "<%= host_location %>"
+  location = "<%= @host_location %>"
 }
 
 /* Feel free to specify as many udp_send_channels as you like.  Gmond
    used to only support having a single channel */
-<% udp_send_channel.each do |channel| -%>
+<% @udp_send_channel.each do |channel| -%>
 udp_send_channel {
   <%- if channel['mcast_join'] then -%>
   mcast_join = <%= channel['mcast_join'] %>
@@ -51,7 +51,7 @@ udp_send_channel {
 
 <% end -%>
 /* You can specify as many udp_recv_channels as you like as well. */
-<% udp_recv_channel.each do |channel| -%>
+<% @udp_recv_channel.each do |channel| -%>
 udp_recv_channel {
   <%- if channel['mcast_join'] then -%>
   mcast_join = <%= channel['mcast_join'] %>
@@ -67,7 +67,7 @@ udp_recv_channel {
 <% end -%>
 /* You can specify as many tcp_accept_channels as you like to share
    an xml description of the state of the cluster */
-<% tcp_accept_channel.each do |channel| -%>
+<% @tcp_accept_channel.each do |channel| -%>
 tcp_accept_channel {
   <%- if channel['port'] then -%>
   port       = <%= channel['port'] %>