From 24bb369066b16551a24252c9c017eb9c08f61b84 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 23 Mar 2016 19:39:33 -0300 Subject: Fix deprecation warnings at maildir template --- templates/maildir.conf.erb | 14 +++++++++----- 1 file 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' %> -- cgit v1.2.3