From a036144de87424ad0cab8fa8491db44af40c0e16 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 27 Jan 2011 19:02:05 +0100
Subject: [PATCH] Documentation: recommend using 4096 bits RSA keys everywhere.
---
ChangeLog | 2 ++
README | 4 ++--
examples/example.dup | 2 +-
handlers/dup.helper.in | 2 +-
man/backupninja.1 | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b66a589..6063fa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@ version 0.9.9 -- UNRELEASED
the patch.
rdiff:
. Generate 4096 bits RSA keys.
+ documentation changes
+ . Recommend using 4096 bits RSA keys everywhere.
version 0.9.8.1 -- October 31, 2010 (boo!)
backupninja changes
diff --git a/README b/README
index 8b01add..41d4186 100644
--- a/README
+++ b/README
@@ -201,8 +201,8 @@ In order for rdiff-backup to sync files over ssh unattended, you must
create ssh keys on the source server and copy the public key to the
remote user's authorized keys file. For example:
- root@srchost# ssh-keygen -t dsa
- root@srchost# ssh-copy-id -i /root/.ssh/id_dsa.pub backup@desthost
+ root@srchost# ssh-keygen -t rsa -b 4096
+ root@srchost# ssh-copy-id -i /root/.ssh/id_rsa.pub backup@desthost
Now, you should be able to ssh from user 'root' on srchost to
user 'backup' on desthost without specifying a password.
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 <SSHOPTION>"
## an example setting would be:
-## sshoptions = -o IdentityFile=/root/.ssh/id_dsa_duplicity
+## sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity
##
## Default:
# sshoptions =
diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in
index 12331a3..f85cf87 100644
--- a/handlers/dup.helper.in
+++ b/handlers/dup.helper.in
@@ -449,7 +449,7 @@ 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_dsa_duplicity
+#sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity
sshoptions = $dup_sshoptions
# put the backups under this destination directory
diff --git a/man/backupninja.1 b/man/backupninja.1
index 5622881..4363222 100644
--- a/man/backupninja.1
+++ b/man/backupninja.1
@@ -104,7 +104,7 @@ Then, vital parts of the file system, including /var/backups, are nightly pushed
.TP
In order for this to work (ie for diff-backup to run unattended), you must create ssh keys on the source server and copy the public key to the remote user's authorized keys file. For example:
.br
-root@srchost# ssh-keygen -t dsa
+root@srchost# ssh-keygen -t rsa -b 4096
.br
root@srchost# ssh-copy-id -i /root/.ssh/id_dsa.pub backup@desthost
.TP
--
GitLab