More variable deprecation rollbacks

diff --git a/templates/maildir.conf.erb b/templates/maildir.conf.erb
index 7f454a364ef878134453150f4a19c58fe5084b6a..4d636eb20a2fb6cfc1209dc35ca1f73d1f3d83b3 100644 (file)
--- 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 cb4617d9f11502a15d449e9cfcb6f0b0172332eb..ad47f153719c9fc6610a566892a40f54645e53e9 100644 (file)
--- 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 ca812ba55b99ff1b8935b5a3a62e7ad2e59ad2b1..9d6abea6030f63c2e584f2a97269025373704828 100644 (file)
--- 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 5ed4acb35a57fe2da56453119ecbc595b46db77b..0a7173c28780be43318ea6faf19df90b34239576 100644 (file)
--- 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 19417af783a8fda752c7cf53f28e13e325bc2bca..67cdcd76dc1f0931979a04e3ee719d7c26f52802 100644 (file)
--- 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