diff options
author | Antoine Beaupre <anarcat@koumbit.org> | 2009-09-24 12:16:03 -0400 |
---|---|---|
committer | Antoine Beaupre <anarcat@koumbit.org> | 2009-09-24 12:16:03 -0400 |
commit | 343f27fa91865c0c20f633f36048f8d61179fb02 (patch) | |
tree | ecc6f2e8aa1616d04d4cc6e550ff35fec9b34f44 /templates/rdiff.conf.erb | |
parent | de010623a8594900b9661db9c0dc8707a1e402fe (diff) | |
parent | 70cae2f75b1938ac26a75597a8e75dc3e7d327b7 (diff) | |
download | puppet-backupninja-343f27fa91865c0c20f633f36048f8d61179fb02.tar.gz puppet-backupninja-343f27fa91865c0c20f633f36048f8d61179fb02.tar.bz2 |
Merge commit 'micah/master'
Conflicts:
manifests/mysql.pp
manifests/rdiff.pp
manifests/server.pp
Diffstat (limited to 'templates/rdiff.conf.erb')
-rw-r--r-- | templates/rdiff.conf.erb | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb index 99bda4e..23c336f 100644 --- a/templates/rdiff.conf.erb +++ b/templates/rdiff.conf.erb @@ -30,25 +30,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) - -%> +<%- %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 -%> |