diff options
| author | intrigeri <intrigeri@boum.org> | 2012-05-15 17:55:51 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-05-15 17:55:51 +0200 |
| commit | ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf (patch) | |
| tree | 392f8d082fb3fc26e1ea30c483c0e19a90f5f7f7 /handlers/dup.helper.in | |
| parent | 1b2dc55cb82d790eca8ea1c2b325a755db75a91a (diff) | |
| parent | 13edaf0912f8b36d5035b5ebdbbc28fd0d498427 (diff) | |
| download | backupninja-ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf.tar.gz backupninja-ad63b8a78b728bf7e2c479e5e26fb4ed9b6d66bf.tar.bz2 | |
Merge tag 'backupninja_upstream/1.0_rc1' into debian
Upstream version 1.0~rc1
Conflicts:
Makefile.in
aclocal.m4
configure
etc/Makefile.in
examples/Makefile.in
handlers/Makefile.in
install-sh
lib/Makefile.in
man/Makefile.in
missing
src/Makefile.in
Diffstat (limited to 'handlers/dup.helper.in')
| -rw-r--r-- | handlers/dup.helper.in | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in index 7f82c2f..ea794c9 100644 --- a/handlers/dup.helper.in +++ b/handlers/dup.helper.in @@ -286,6 +286,12 @@ nicelevel = $dup_nicelevel # if 'desturl' is set below, 'testconnect' must be set to 'no' for now. testconnect = $dup_testconnect +## temporary directory used by duplicity, set to some other location if your /tmp is small +## default is either /tmp or /usr/tmp, depending on the system +## +## Default: +# tmpdir = /tmp + ###################################################### ## gpg section ## (how to encrypt and optionally sign the backups) @@ -448,6 +454,16 @@ keepincroffulls = $dup_keepincroffulls #awsaccesskeyid = YOUR_AWS_ACCESS_KEY_ID #awssecretaccesskey = YOUR_AWS_SECRET_KEY +## RackSpace's CloudFiles username, API key, and authentication URL. +## cfusername = YOUR_CF_USERNAME +## cfapikey = YOUR_CF_API_KEY +## cfauthurl = YOUR_CF_AUTH_URL +## +## Default: +# cfusername = +# cfapikey = +# cfauthurl = + # FTP password, needed for backups using desturl = ftp://... #ftp_password = @@ -457,11 +473,20 @@ keepincroffulls = $dup_keepincroffulls #bandwidthlimit = 128 bandwidthlimit = $dup_bandwidth -# passed directly to ssh, scp (and sftp in duplicity >=0.4.2) -# warning: sftp does not support all scp options, especially -i; as -# a workaround, you can use "-o <SSHOPTION>" -#sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity -sshoptions = $dup_sshoptions +## duplicity < 0.6.17 +## ------------------ +## passed directly to ssh, scp (and sftp in duplicity >=0.4.2) +## warning: sftp does not support all scp options, especially -i; as +## a workaround, you can use "-o <SSHOPTION>" +## an example setting would be: +## sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity +## +## duplicity >= 0.6.17 +## ------------------ +## supports only "-o IdentityFile=..." +## +## Default: +# sshoptions = # put the backups under this destination directory # if using 'desturl' above, this must not be set |