diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 11:22:26 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 11:22:26 -0300 |
| commit | 01e32b5549fad5ec719a8650f5dbfac739e9c2fd (patch) | |
| tree | aba6a0b71fab1e87dea6d5ede0c73d0c5e51c428 | |
| parent | fee18a9d990fc03c696c3dab17c5c111c7d1264f (diff) | |
| parent | 497513547be79f9d3c8e96f1650ec43ee634b277 (diff) | |
| download | puppet-backupninja-01e32b5549fad5ec719a8650f5dbfac739e9c2fd.tar.gz puppet-backupninja-01e32b5549fad5ec719a8650f5dbfac739e9c2fd.tar.bz2 | |
Merge remote-tracking branch 'shared/master' into develop
Conflicts:
templates/backupninja.conf.erb
templates/sh.conf.erb
| -rw-r--r-- | templates/backupninja.conf.erb | 6 | ||||
| -rw-r--r-- | templates/sh.conf.erb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/backupninja.conf.erb b/templates/backupninja.conf.erb index 6b0a0dd..7706a61 100644 --- a/templates/backupninja.conf.erb +++ b/templates/backupninja.conf.erb @@ -8,13 +8,13 @@ when = <%= send(:when) %> reportemail = <%= @reportemail %> reportsuccess = <%= @reportsuccess ? 'yes' : 'no' %> reportwarning = <%= @reportwarning ? 'yes' : 'no' %> -<% if @reporthost -%> +<% if reporthost.is_a? String -%> <%= 'reporthost = ' + @reporthost %> <% end -%> -<% if @reportuser -%> +<% if reportuser.is_a? String -%> <%= 'reportuser = ' + @reportuser %> <% end -%> -<% if @reportdirectory -%> +<% if reportdirectory.is_a? String -%> <%= 'reportdirectory = ' + @reportdirectory %> <% end -%> logfile = <%= @logfile %> diff --git a/templates/sh.conf.erb b/templates/sh.conf.erb index e0e5137..f1b4161 100644 --- a/templates/sh.conf.erb +++ b/templates/sh.conf.erb @@ -5,6 +5,6 @@ # the next time Puppet runs. Please make configuration changes to this # service in Puppet. -<% @command_string.each do |line| -%> +<% @command_string.each_line do |line| -%> <%= line %> <% end -%> |