From a036144de87424ad0cab8fa8491db44af40c0e16 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 27 Jan 2011 19:02:05 +0100 Subject: Documentation: recommend using 4096 bits RSA keys everywhere. --- examples/example.dup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/example.dup') diff --git a/examples/example.dup b/examples/example.dup index 0ed5b2a..3eb4529 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -203,7 +203,7 @@ exclude = /var/cache/backupninja/duplicity ## warning: sftp does not support all scp options, especially -i; as ## a workaround, you can use "-o " ## an example setting would be: -## sshoptions = -o IdentityFile=/root/.ssh/id_dsa_duplicity +## sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity ## ## Default: # sshoptions = -- cgit v1.2.3 From 2392094a242248f702ebfcb4644f623d2d3aedde Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 16 Feb 2011 08:22:10 +0100 Subject: Make units clearer (Closes Redmine bug #2737). --- ChangeLog | 2 ++ examples/example.dup | 4 ++-- examples/example.rsync | 2 +- handlers/dup.helper.in | 2 +- handlers/rsync.in | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'examples/example.dup') diff --git a/ChangeLog b/ChangeLog index 6063fa9..2a94593 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,10 +26,12 @@ version 0.9.9 -- UNRELEASED #2370). Thanks to ale for the patch. rsync: . Fix long rotation. + . Make units clearer (Closes Redmine bug #2737) helper changes dup: . Fix separate signing key usecase. Thanks to Ian Beckwith for the patch. + . Make units clearer (Closes Redmine bug #2737) rdiff: . Generate 4096 bits RSA keys. documentation changes diff --git a/examples/example.dup b/examples/example.dup index 3eb4529..cc64790 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -191,9 +191,9 @@ exclude = /var/cache/backupninja/duplicity ## Default: # ftp_password = -## bandwith limit, in kbit/s ; default is 0, i.e. no limit +## bandwith limit, in Kbit/s ; default is 0, i.e. no limit ## if using 'desturl' above, 'bandwidthlimit' must not be set -## an example setting of 128 kbps would be: +## an example setting of 128 Kbit/s would be: ## bandwidthlimit = 128 ## ## Default: diff --git a/examples/example.rsync b/examples/example.rsync index 9053f3e..3c280ba 100644 --- a/examples/example.rsync +++ b/examples/example.rsync @@ -89,7 +89,7 @@ exclude_vserver = excluded_vserver2 # if set to 1, compress data on rsync (remote source only) #compress = 0 -# set a badnwidth limit in kbps (remote source only) +# set a badnwidth limit in KB/s (remote source only) #bandwidthlimit = # remote rsync program (remote source only) diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in index f85cf87..5cd9dc6 100644 --- a/handlers/dup.helper.in +++ b/handlers/dup.helper.in @@ -442,7 +442,7 @@ keep = $dup_keep # bandwith limit, in kbit/s ; default is 0, i.e. no limit # if using 'desturl' above, 'bandwidthlimit' must not be set -# an example setting of 128 kbps would be: +# an example setting of 128 Kbit/s would be: #bandwidthlimit = 128 bandwidthlimit = $dup_bandwidth diff --git a/handlers/rsync.in b/handlers/rsync.in index 7b06c24..d35445e 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -60,7 +60,7 @@ # exclude_vserver = vserver-name (valid only if vservers = yes on backupninja.conf) # numericids = when set to 1, use numeric ids instead of user/group mappings on rsync # compress = if set to 1, compress data on rsync (remote source only) -# bandwidthlimit = set a badnwidth limit in kbps (remote source only) +# bandwidthlimit = set a badnwidth limit in KB/s (remote source only) # remote_rsync = remote rsync program (remote source only) # id_file = ssh key file (remote source only) # batch = set to "yes" to rsync use a batch file as source @@ -79,7 +79,7 @@ # port = remote port number (remote destination only) # user = remote user name (remote destination only) # id_file = ssh key file (remote destination only) -# bandwidthlimit = set a badnwidth limit in kbps (remote destination only) +# bandwidthlimit = set a badnwidth limit in KB/s (remote destination only) # remote_rsync = remote rsync program (remote dest only) # batch = set to "yes" to rsync write a batch file from the changes # batchbase = folder where the batch file should be written -- cgit v1.2.3 From 3e60fd37de03d211bd6553991df4f6929526841a Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Mon, 25 Apr 2011 22:49:57 +0200 Subject: Adding new option --- examples/example.dup | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'examples/example.dup') diff --git a/examples/example.dup b/examples/example.dup index cc64790..5e6b424 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -164,6 +164,14 @@ exclude = /var/cache/backupninja/duplicity ## Default: # keep = 60 +# for how many full backups do we keep their later increments ; +# default is all (keep all increments). +# increments for older full backups will be deleted : only the more +# recent ones (count provided) will be kept +# +## Default: +# keepincroffulls = all + ## full destination URL, in duplicity format; if set, desturl overrides ## sshoptions, destdir, desthost and destuser; it also disables testconnect and ## bandwithlimit. For details, see duplicity manpage, section "URL FORMAT", some -- cgit v1.2.3