aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-03-11 16:54:34 -0400
committerMicah Anderson <micah@riseup.net>2009-03-11 16:54:34 -0400
commitcb05e48d7ed052c2ddad5a0a20e0d253080675ae (patch)
treef9294ecffa2bc6eb0f6da4ba14d6dfea296307c1 /templates
parentd7e2830475b530f00567f77628d58e9e27f3a0b8 (diff)
downloadpuppet-backupninja-cb05e48d7ed052c2ddad5a0a20e0d253080675ae.tar.gz
puppet-backupninja-cb05e48d7ed052c2ddad5a0a20e0d253080675ae.tar.bz2
the default value for sshoptions is 'false' and this value ends up getting
set into the rdiff config, so 'sshoptions = false' which results in the host attempting to connect to a hostname called 'false'. This change only includes it if the value is not 'false'.
Diffstat (limited to 'templates')
-rw-r--r--templates/rdiff.conf.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index 0e19125..a28917a 100644
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -33,7 +33,7 @@ type = local
if VersionComparer.versioncmp(Puppet.version,'0.24.6') >= 0
%w{type host directory user sshoptions}.each do |v|
- if has_variable?(v)
+ if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false"
-%>
<%= v + ' = ' + instance_variable_get("@#{v}").to_s %>
<%-