diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-27 10:53:49 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-27 10:53:49 -0300 |
| commit | 9561932b03ea52f434654157d8348ffa95325f5e (patch) | |
| tree | 4fc5226da2b3dc450b7775d627c5fc21e0070744 | |
| parent | 98e14e6257f9c15aee4994918ff2d069ed13752a (diff) | |
| parent | e204bd1d6296946314b640ad556e58b0612826ca (diff) | |
| download | puppet-backupninja-9561932b03ea52f434654157d8348ffa95325f5e.tar.gz puppet-backupninja-9561932b03ea52f434654157d8348ffa95325f5e.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/module_backupninja
| -rw-r--r-- | manifests/dup.pp | 4 | ||||
| -rw-r--r-- | templates/dup.conf.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/manifests/dup.pp b/manifests/dup.pp index dc597f7..23da8cd 100644 --- a/manifests/dup.pp +++ b/manifests/dup.pp @@ -14,7 +14,7 @@ # find the correct file to remove). # # options, nicelevel, testconnect, tmpdir, sign, encryptkey, signkey, -# password, include, exclude, vsinclude, incremental, keep, bandwithlimit, +# password, include, exclude, vsinclude, incremental, keep, bandwidthlimit, # sshoptions, destdir, desthost, desuser: # # As defined in the backupninja documentation. The options will be @@ -72,7 +72,7 @@ define backupninja::duplicity( $order = 90, # [dest] $incremental = "yes", $keep = false, - $bandwithlimit = false, + $bandwidthlimit = false, $sshoptions = false, $destdir = false, $desthost = false, diff --git a/templates/dup.conf.erb b/templates/dup.conf.erb index ce77a5c..2a61443 100644 --- a/templates/dup.conf.erb +++ b/templates/dup.conf.erb @@ -36,7 +36,7 @@ [dest] <%= 'incremental = ' + incremental if incremental %> <%= 'keep = ' + keep if keep %> -<%= 'bandwithlimit = ' + bandwithlimit if bandwithlimit %> +<%= 'bandwidthlimit = ' + bandwidthlimit if bandwidthlimit %> <%= 'sshoptions = ' + sshoptions if sshoptions %> <%= 'destdir = ' + destdir if destdir %> <%= 'desthost = ' + desthost if desthost %> |