From 497513547be79f9d3c8e96f1650ec43ee634b277 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 11 Mar 2016 15:47:01 -0500
Subject: update variables for new puppet

---
 templates/backupninja.conf.erb | 26 +++++++++++++-------------
 templates/sh.conf.erb          |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/backupninja.conf.erb b/templates/backupninja.conf.erb
index fe7affa..7706a61 100644
--- a/templates/backupninja.conf.erb
+++ b/templates/backupninja.conf.erb
@@ -3,23 +3,23 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-loglevel = <%= loglvl %>
+loglevel = <%= @loglvl %>
 when = <%= send(:when) %>
-reportemail = <%= reportemail %>
-reportsuccess = <%= reportsuccess ? 'yes' : 'no' %>
-reportwarning = <%= reportwarning ? 'yes' : 'no' %>
-<% if @reporthost -%>
+reportemail = <%= @reportemail %>
+reportsuccess = <%= @reportsuccess ? 'yes' : 'no' %>
+reportwarning = <%= @reportwarning ? 'yes' : 'no' %>
+<% if reporthost.is_a? String -%>
 <%= 'reporthost = ' + @reporthost %>
 <% end -%>
-<% if @reportuser -%>
+<% if reportuser.is_a? String -%>
 <%= 'reportuser = ' + @reportuser %>
 <% end -%>
-<% if @reportdirectory -%>
+<% if reportdirectory.is_a? String -%>
 <%= 'reportdirectory = ' + @reportdirectory %>
 <% end -%>
-logfile = <%= logfile %>
-configdirectory = <%= configdir %>
-scriptdirectory = <%= scriptdir %>
-libdirectory = <%= libdir %>
-usecolors = <%= usecolors ? 'yes' : 'no' %>
-vservers = <%= vservers ? 'yes' : 'no' %>
+logfile = <%= @logfile %>
+configdirectory = <%= @configdir %>
+scriptdirectory = <%= @scriptdir %>
+libdirectory = <%= @libdir %>
+usecolors = <%= @usecolors ? 'yes' : 'no' %>
+vservers = <%= @vservers ? 'yes' : 'no' %>
diff --git a/templates/sh.conf.erb b/templates/sh.conf.erb
index f1e77ff..f1b4161 100644
--- a/templates/sh.conf.erb
+++ b/templates/sh.conf.erb
@@ -5,6 +5,6 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-<% command_string.each do |line| -%>
+<% @command_string.each_line do |line| -%>
 <%= line %>
 <% end -%>
-- 
cgit v1.2.3