Add features for duplicity type backup

Add support for increments,keepincroffulls,desturl
Include proper backupninja::client:: class (as does rsync)

diff --git a/manifests/dup.pp b/manifests/dup.pp
index 5ffce29c65b05e2411f53ec0b83d83e7ac93b9c6..99b64f86968d46834625a1c47e16f7ce2f4fa68b 100644 (file)
--- a/manifests/dup.pp
+++ b/manifests/dup.pp
@@ -71,12 +71,15 @@ define backupninja::duplicity( $order  = 90,
                                $vsinclude = false,
                                # [dest]
                                $incremental   = "yes",
+                               $increments   = false,
                                $keep          = false,
+                               $keepincroffulls = false,
                                $bandwidthlimit = false,
                                $sshoptions    = false,
                                $destdir       = false,
                                $desthost      = false,
                                $destuser      = false,
+                               $desturl       = false,
                                # configs to backupninja client
                                $backupkeystore       = false,
                                $backupkeystorefspath = '',
@@ -94,7 +97,7 @@ define backupninja::duplicity( $order  = 90,
                                $installkey           = true ) {
 
   # the client with configs for this machine
-  include backupninja::client::defaults
+  include backupninja::client::duplicity
 
   case $desthost { false: { err("need to define a destination host for remote backups!") } }
   case $destdir { false: { err("need to define a destination directory for remote backups!") } }

diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb
index 2a614430df6e5a5c2936f862732e67318802d482..4f15e789cd35e3d397e0e28d31f0fbd01aaa0406 100644 (file)
--- a/templates/dup.conf.erb
+++ b/templates/dup.conf.erb
@@ -35,9 +35,12 @@
 
 [dest]
 <%= 'incremental = ' + incremental if incremental %>
+<%= 'increments = ' + increments if increments %>
 <%= 'keep = ' + keep if keep %>
+<%= 'keepincroffulls = ' + keepincroffulls if keepincroffulls %>
 <%= 'bandwidthlimit = ' + bandwidthlimit if bandwidthlimit %>
 <%= 'sshoptions = ' + sshoptions if sshoptions %>
 <%= 'destdir = ' + destdir if destdir %>
 <%= 'desthost = ' + desthost if desthost %>
 <%= 'destuser = ' + destuser if destuser %>
+<%= 'desturl = ' + desturl if desturl %>