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 /examples/example.dup | |
| 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 'examples/example.dup')
| -rw-r--r-- | examples/example.dup | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/examples/example.dup b/examples/example.dup index 5e6b424..55ac565 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -194,6 +194,16 @@ exclude = /var/cache/backupninja/duplicity # awsaccesskeyid = # awssecretaccesskey = +## 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://... ## ## Default: @@ -207,12 +217,18 @@ exclude = /var/cache/backupninja/duplicity ## Default: # bandwidthlimit = 0 +## 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 = |