From d5f3dbe0a5ff87a619bec9a99c0618f90f781659 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 20 Oct 2015 14:14:08 -0200
Subject: Fix variable deprecations on templates

---
 templates/dup.conf.erb | 60 +++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'templates/dup.conf.erb')

diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb
index 4f15e78..533bb74 100644
--- a/templates/dup.conf.erb
+++ b/templates/dup.conf.erb
@@ -3,44 +3,44 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-<%= 'options = ' + options if options %>
-<%= 'nicelevel = ' + nicelevel if nicelevel %>
-<%= 'testconnect = ' + testconnect if testconnect %>
-<%= 'tmpdir = ' + tmpdir if tmpdir %>
+<%= 'options = ' + @options if @options %>
+<%= 'nicelevel = ' + @nicelevel if @nicelevel %>
+<%= 'testconnect = ' + @testconnect if @testconnect %>
+<%= 'tmpdir = ' + @tmpdir if @tmpdir %>
 
 [gpg]
-<%= 'sign = ' + sign if sign %>
-<%= 'encryptkey = ' + encryptkey if encryptkey %>
-<%= 'signkey = ' + signkey if signkey %>
-<%= 'password = ' + password if password %>
+<%= 'sign = ' + @sign if @sign %>
+<%= 'encryptkey = ' + @encryptkey if @encryptkey %>
+<%= 'signkey = ' + @signkey if @signkey %>
+<%= 'password = ' + @password if @password %>
 
 [source]
-<% if include.is_a? String -%>
-<%= 'include = ' + include %>
-<% elsif include.is_a? Array -%>
-<%= include.map { |i| "include = #{i}" }.join("\n") %>
+<% if @include.is_a? String -%>
+<%= 'include = ' + @include %>
+<% elsif @include.is_a? Array -%>
+<%= @include.map { |i| "include = #{i}" }.join("\n") %>
 <% end -%>
 
-<% if exclude.is_a? String -%>
-<%= 'exclude = ' + exclude %>
-<% elsif exclude.is_a? Array -%>
-<%= exclude.map { |i| "exclude = #{i}" }.join("\n") %>
+<% if @exclude.is_a? String -%>
+<%= 'exclude = ' + @exclude %>
+<% elsif @exclude.is_a? Array -%>
+<%= @exclude.map { |i| "exclude = #{i}" }.join("\n") %>
 <% end -%>
 
-<% if vsinclude.is_a? String -%>
-<%= 'vsinclude = ' + vsinclude %>
-<% elsif vsinclude.is_a? Array -%>
-<%= vsinclude.map { |i| "vsinclude = #{i}" }.join("\n") %>
+<% if @vsinclude.is_a? String -%>
+<%= 'vsinclude = ' + @vsinclude %>
+<% elsif @vsinclude.is_a? Array -%>
+<%= @vsinclude.map { |i| "vsinclude = #{i}" }.join("\n") %>
 <% end -%>
 
 [dest]
-<%= 'incremental = ' + incremental if incremental %>
-<%= 'increments = ' + increments if increments %>
-<%= 'keep = ' + keep if keep %>
-<%= 'keepincroffulls = ' + keepincroffulls if keepincroffulls %>
-<%= 'bandwidthlimit = ' + bandwidthlimit if bandwidthlimit %>
-<%= 'sshoptions = ' + sshoptions if sshoptions %>
-<%= 'destdir = ' + destdir if destdir %>
-<%= 'desthost = ' + desthost if desthost %>
-<%= 'destuser = ' + destuser if destuser %>
-<%= 'desturl = ' + desturl if desturl %>
+<%= 'incremental = ' + @incremental if @incremental %>
+<%= 'increments = ' + @increments if @increments %>
+<%= 'keep = ' + @keep if @keep %>
+<%= 'keepincroffulls = ' + @keepincroffulls if @keepincroffulls %>
+<%= 'bandwidthlimit = ' + @bandwidthlimit if @bandwidthlimit %>
+<%= 'sshoptions = ' + @sshoptions if @sshoptions %>
+<%= 'destdir = ' + @destdir if @destdir %>
+<%= 'desthost = ' + @desthost if @desthost %>
+<%= 'destuser = ' + @destuser if @destuser %>
+<%= 'desturl = ' + @desturl if @desturl %>
-- 
cgit v1.2.3