Add vsinclude option to rdiff handler

diff --git a/manifests/rdiff.pp b/manifests/rdiff.pp
index 0a84a6bbfc2f75cdeb7f8f7735e6c64b8da6ceed..580af8719790315953b7ea38c9fe2033962c983a 100644 (file)
--- a/manifests/rdiff.pp
+++ b/manifests/rdiff.pp
@@ -23,6 +23,7 @@ define backupninja::rdiff($order = 90,
                            $type = 'local',
                            $exclude = [ "/home/*/.gnupg", "/home/*/.local/share/Trash", "/home/*/.Trash", "/home/*/.thumbnails", "/home/*/.beagle", "/home/*/.aMule", "/home/*/gtk-gnutella-downloads" ],
                            $include = [ "/var/spool/cron/crontabs", "/var/backups", "/etc", "/root", "/home", "/usr/local/*bin", "/var/lib/dpkg/status*" ],
+                           $vsinclude = false,
                            $keep = 30,
                            $sshoptions = false,
                            $options = false,

diff --git a/templates/rdiff.conf.erb b/templates/rdiff.conf.erb
index 2906dc4daa21e4f94a495baabff1c959903f13cb..f5548e425d53e38928ada1720d2205f3e9f46db6 100644 (file)
--- a/templates/rdiff.conf.erb
+++ b/templates/rdiff.conf.erb
@@ -21,6 +21,12 @@ type = local
 <%= exclude.map { |i| "exclude = #{i}" }.join("\n") %>
 <% end -%>
 
+<% if vsinclude.is_a? String -%>
+<%= 'vsinclude = ' + vsinclude %>
+<% elsif vsinclude.is_a? Array -%>
+<%= vsinclude.map { |i| "vsinclude = #{i}" }.join("\n") %>
+<% end -%>
+
 [dest]
 <% %w{type host directory user sshoptions}.each do |v|
        if @scope.lookupvar(v)