aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2013-07-23 12:01:02 +0200
committerintrigeri <intrigeri@boum.org>2013-07-23 12:01:02 +0200
commitb3275eb7b15788049576e2ab96e1e82cce398240 (patch)
treecc8473a4c2c06383954b37e7062f3f01ffd3e8ea
parente732e8475002c73f2eb66a073a7efb6f200a3360 (diff)
downloadbackupninja-b3275eb7b15788049576e2ab96e1e82cce398240.tar.gz
backupninja-b3275eb7b15788049576e2ab96e1e82cce398240.tar.bz2
Clarify that duplicity/paramiko doesn't support spaces between -o and IdentityFile anymore.
-rw-r--r--examples/example.dup6
-rw-r--r--handlers/dup.helper.in6
2 files changed, 8 insertions, 4 deletions
diff --git a/examples/example.dup b/examples/example.dup
index 55ac565..ff8b70d 100644
--- a/examples/example.dup
+++ b/examples/example.dup
@@ -226,8 +226,10 @@ exclude = /var/cache/backupninja/duplicity
## sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity
##
## duplicity >= 0.6.17
-## ------------------
-## supports only "-o IdentityFile=..."
+## -------------------
+## supports only "-oIdentityFile=..." since duplicity >=0.6.17 uses paramiko,
+## a ssh python module.
+## warning: requires no space beetween "-o" and "IdentityFile=...".
##
## Default:
# sshoptions =
diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in
index ea794c9..dc21bfc 100644
--- a/handlers/dup.helper.in
+++ b/handlers/dup.helper.in
@@ -482,8 +482,10 @@ bandwidthlimit = $dup_bandwidth
## sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity
##
## duplicity >= 0.6.17
-## ------------------
-## supports only "-o IdentityFile=..."
+## -------------------
+## supports only "-oIdentityFile=..." since duplicity >=0.6.17 uses paramiko,
+## a ssh python module.
+## warning: requires no space beetween "-o" and "IdentityFile=...".
##
## Default:
# sshoptions =