diff options
| author | LeLutin <gabster@lelutin.ca> | 2015-04-17 21:07:25 +0000 |
|---|---|---|
| committer | LeLutin <gabster@lelutin.ca> | 2015-04-17 21:07:25 +0000 |
| commit | 74ce68bcf6f1fbf938e4a161f7c6305f67378b7d (patch) | |
| tree | 988602a8ca24e70f46ee3b4432460d8a93df674c | |
| parent | d0da8bea7182b9faeed653b9d6a107a4b58eb2cd (diff) | |
| parent | 568b1d68d9bc94791e37aff3a6658643c6590adb (diff) | |
Merge branch 'duplicity_patches' into 'master'
Add features for duplicity type backup
Add support for increments,keepincroffulls,desturl
Include proper backupninja::client:: class (as does rsync)
See merge request !3
| -rw-r--r-- | manifests/dup.pp | 5 | ||||
| -rw-r--r-- | templates/dup.conf.erb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/manifests/dup.pp b/manifests/dup.pp index 5ffce29..99b64f8 100644 --- 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 2a61443..4f15e78 100644 --- 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 %> |