From 20e9e120c8f565bd31a301b56b85a7652afa1358 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Mon, 24 Mar 2014 12:37:15 -0500
Subject: doc: Add information about ecdsa keys

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 doc/appendix/guides/import-existing-ssh-keys.txt | 7 ++++++-
 doc/server/plugins/generators/sshbase.txt        | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/appendix/guides/import-existing-ssh-keys.txt b/doc/appendix/guides/import-existing-ssh-keys.txt
index 64a1b62cd..a0a628c58 100644
--- a/doc/appendix/guides/import-existing-ssh-keys.txt
+++ b/doc/appendix/guides/import-existing-ssh-keys.txt
@@ -1,4 +1,5 @@
 .. -*- mode: rst -*-
+.. vim: ft=rst
 
 .. _appendix-guides-import-existing-ssh-keys:
 
@@ -25,6 +26,10 @@ appropriate entries.::
 
     cat > /tmp/ssh.xml << EOF
     <Bundle name='ssh'>
+      <!-- requires a version of openssh that can generate ecdsa keys -->
+      <Path name="/etc/ssh/ssh_host_ecdsa_key"/>
+      <Path name="/etc/ssh/ssh_host_ecdsa_key.pub"/>
+
       <Path name='/etc/ssh/ssh_host_dsa_key'/>
       <Path name='/etc/ssh/ssh_host_rsa_key'/>
       <Path name='/etc/ssh/ssh_host_dsa_key.pub'/>
@@ -86,7 +91,7 @@ Now, we pull the ssh host key data for the client out of the uploaded
 stats and insert it as host-specific copies of these files in
 ``/var/lib/bcfg2/SSHBase``.::
 
-    for key in ssh_host_rsa_key ssh_host_dsa_key ssh_host_key; do
+    for key in ssh_host_ecdsa_key ssh_host_rsa_key ssh_host_dsa_key ssh_host_key; do
         sudo bcfg2-admin pull <clientname> Path /etc/ssh/$key
         sudo bcfg2-admin pull <clientname> Path /etc/ssh/$key.pub
     done
diff --git a/doc/server/plugins/generators/sshbase.txt b/doc/server/plugins/generators/sshbase.txt
index d8bc950a2..38631dd3b 100644
--- a/doc/server/plugins/generators/sshbase.txt
+++ b/doc/server/plugins/generators/sshbase.txt
@@ -1,4 +1,5 @@
 .. -*- mode: rst -*-
+.. vim: ft=rst
 
 .. _server-plugins-generators-sshbase:
 
@@ -13,8 +14,9 @@ record for the current system.
 
 It has two functions:
 
-* Generating new ssh keys -- When a client requests a dsa, rsa, or v1 key,
-  and there is no existing key in the repository, one is generated.
+* Generating new ssh keys -- When a client requests a ecdsa, dsa, rsa,
+  or v1 key, and there is no existing key in the repository, one is
+  generated.
 
 * Maintaining the ``ssh_known_hosts`` file -- all current known public
   keys (and extra public key stores) are integrated into a single
-- 
cgit v1.2.3-1-g7c22