summaryrefslogtreecommitdiff
path: root/website/getting-started-user.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'website/getting-started-user.mdwn')
-rw-r--r--website/getting-started-user.mdwn15
1 files changed, 9 insertions, 6 deletions
diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn
index 9b04edc..d96e5b0 100644
--- a/website/getting-started-user.mdwn
+++ b/website/getting-started-user.mdwn
@@ -49,7 +49,6 @@ key for that host to the `known_hosts` file if one is found. This
command could be added to a crontab as well, if desired.
-
Using `monkeysphere-ssh-proxycommand`(1)
----------------------------------------
@@ -59,7 +58,7 @@ up-to-date for the host you are connecting to with ssh. The best way
to integrate this is to add the following line to the "Host *" section
of your `~/.ssh/config` file:
- ProxyCommand monkeysphere-ssh-proxycommand %h %p
+ ProxyCommand monkeysphere ssh-proxycommand %h %p
The "Host *" section specifies what ssh options to use for all
connections. If you don't already have a "Host *" line, you can add it
@@ -84,15 +83,19 @@ verify you based on your OpenPGP key.
Setting up an OpenPGP authentication key
----------------------------------------
-First things first: you'll need to create an "authentication" subkey
-for your current key, if you don't already have one. If you already
-have a GPG key, you can add an authentication subkey with:
+First things first: you'll need to have a OpenPGP "authentication"
+subkey for your current key, if you don't already have one. If you
+already have a GPG key, you can generate an authentication subkey with
+the `gen-subkey` command:
$ monkeysphere gen-subkey
If you have more than one secret key, you'll need to specify the key
-you want to add the subkey to on the command line.
+you want to add the subkey to on the command line. It have already
+have an ssh pub key that you use regularly, you can import this key
+into GPG with the `import-subkey` command:
+ $ monkeysphere import-subkey ~/.ssh/id_rsa
Using your OpenPGP authentication key for SSH