aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-23 19:39:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-23 19:39:33 -0300
commit24bb369066b16551a24252c9c017eb9c08f61b84 (patch)
tree047851b9475341be92daa6a8341a92d23a7a2c6a
parenteb3a90efda501611e09c00f6160f600606955d54 (diff)
downloadpuppet-backupninja-24bb369066b16551a24252c9c017eb9c08f61b84.tar.gz
puppet-backupninja-24bb369066b16551a24252c9c017eb9c08f61b84.tar.bz2
Fix deprecation warnings at maildir template
-rw-r--r--templates/maildir.conf.erb14
1 files changed, 9 insertions, 5 deletions
diff --git a/templates/maildir.conf.erb b/templates/maildir.conf.erb
index 4d636eb..ac1611a 100644
--- a/templates/maildir.conf.erb
+++ b/templates/maildir.conf.erb
@@ -3,11 +3,15 @@
# 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|
- if send(v)
- -%><%= v + ' = ' + send(v) + "\n" %><%
- end
-end -%>
+<%= 'when = '+ @when if @when %>
+<%= 'srcdir = '+ @srcdir if @srcdir %>
+<%= 'destdir = '+ @destdir if @destdir %>
+<%= 'desthost = '+ @desthost if @desthost %>
+<%= 'destuser = '+ @destuser if @destuser %>
+<%= 'destid_file = '+ @destid_file if @destid_file %>
+<%= 'keepdaily = '+ @keepdaily if @keepdaily %>
+<%= 'keepweekly = '+ @keepweekly if @keepweekly %>
+<%= 'keepmonthly = '+ @keepmonthly if @keepmonthly %>
remove = <%= @remove ? 'yes' : 'no' %>
multiconnection = <%= @multiconnection ? 'yes' : 'no' %>