aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/rdiff.conf.erb26
1 files changed, 5 insertions, 21 deletions
diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index a28917a..a41e969 100644
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -28,25 +28,9 @@ type = local
<% end -%>
[dest]
-<%- include Puppet::Util::Package
- class VersionComparer; extend Puppet::Util::Package; end
-
- if VersionComparer.versioncmp(Puppet.version,'0.24.6') >= 0
- %w{type host directory user sshoptions}.each do |v|
- if has_variable?(v) and instance_variable_get("@#{v}").to_s != "false"
- -%>
+<%- %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 %>
- <%-
- end
- end
- %>
-<%- else -%>
- <%- %w{type host directory user sshoptions}.each do |v|
- if @scope.lookupvar(v)
- -%>
-<%= v + ' = ' + @scope.lookupvar(v) %>
- <%-
- end
- end
- %>
-<%- end -%>
+<%-
+ end
+end -%>