From fee18a9d990fc03c696c3dab17c5c111c7d1264f Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 26 Oct 2015 12:36:11 -0200
Subject: More variable deprecation rollbacks

---
 templates/maildir.conf.erb |  2 +-
 templates/mysql.conf.erb   |  2 +-
 templates/rdiff.conf.erb   |  2 +-
 templates/rsync.conf.erb   | 10 +++++-----
 templates/svn.conf.erb     |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/maildir.conf.erb b/templates/maildir.conf.erb
index 7f454a3..4d636eb 100644
--- a/templates/maildir.conf.erb
+++ b/templates/maildir.conf.erb
@@ -3,7 +3,7 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-<% %w{@when @srcdir @destdir @desthost @destuser @destid_file @keepdaily @keepweekly @keepmonthly}.each do |v|
+<% %w{when srcdir destdir desthost destuser destid_file keepdaily keepweekly keepmonthly}.each do |v|
 	if send(v)
 		-%><%= v + ' = ' + send(v) + "\n" %><%
 	end
diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb
index cb4617d..ad47f15 100644
--- a/templates/mysql.conf.erb
+++ b/templates/mysql.conf.erb
@@ -3,7 +3,7 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-<% %w{@user @dbusername @dbpassword @dbhost @databases @backupdir @vsname @sqldumpoptions}.each do |v|
+<% %w{user dbusername dbpassword dbhost databases backupdir vsname sqldumpoptions}.each do |v|
 	if send(v)
 		-%><%= v + ' = ' + send(v) + "\n" %><%
 	end
diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index ca812ba..9d6abea 100644
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -30,7 +30,7 @@ type = local
 <% end -%>
 
 [dest]
-<%- %w{@type @host @directory @user @sshoptions}.each do |v|
+<%- %w{type host directory user sshoptions}.each do |v|
     if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
 <%-
diff --git a/templates/rsync.conf.erb b/templates/rsync.conf.erb
index 5ed4acb..0a7173c 100644
--- a/templates/rsync.conf.erb
+++ b/templates/rsync.conf.erb
@@ -4,7 +4,7 @@
 # service in Puppet.
 
 [general]
-<%- %w{@log @partition @fscheck @read_only @mountpoint @backupdir @format @days @keepdaily @keepweekly @keepmonthly @lockfile @nicelevel @enable_mv_timestamp_bug, @tmp, @multiconnection}.each do |v|
+<%- %w{log partition fscheck read_only mountpoint backupdir format days keepdaily keepweekly keepmonthly lockfile nicelevel enable_mv_timestamp_bug, tmp, multiconnection}.each do |v|
     if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
 <%-
@@ -15,7 +15,7 @@ end -%>
 <% unless @from.empty? and @from.to_s != "false" -%>
 from = <%= f@rom %>
 <% end -%>
-<%- %w{@include exclude}.each do |v|
+<%- %w{include exclude}.each do |v|
     if has_variable?(v)
       instance_variable_get("@#{v}").to_a.each do |parameter| -%>
 <%= v + ' = ' + parameter %>
@@ -25,7 +25,7 @@ from = <%= f@rom %>
 end -%>
 
 [dest]
-<%- %w{@dest @testconnect @ssh @protocol @numericids @compress @host @port @user @id_file @bandwidthlimit @remote_rsync @batch @batchbase @fakesuper}.each do |v|
+<%- %w{dest testconnect ssh protocol numericids compress host port user id_file bandwidthlimit remote_rsync batch batchbase fakesuper}.each do |v|
     if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
 <%-
@@ -33,7 +33,7 @@ end -%>
 end -%>
 
 [services]
-<%- %w{@initscripts service}.each do |v|
+<%- %w{initscripts service}.each do |v|
     if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
 <%-
@@ -41,7 +41,7 @@ end -%>
 end -%>
 
 [system]
-<%- %w{@rm @cp @touch @mv @fsck}.each do |v|
+<%- %w{rm cp touch mv fsck}.each do |v|
     if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false" -%>
 <%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
 <%-
diff --git a/templates/svn.conf.erb b/templates/svn.conf.erb
index 19417af..67cdcd7 100644
--- a/templates/svn.conf.erb
+++ b/templates/svn.conf.erb
@@ -3,7 +3,7 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-<% %w{@src @dest @tmp @vsname}.each do |v|
+<% %w{src dest tmp vsname}.each do |v|
 	if send(v)
 		-%><%= v + ' = ' + send(v) + "\n" %><%
 	end
-- 
cgit v1.2.3