From 4445214926ce53041da3d267ceb88fbc68dc8b42 Mon Sep 17 00:00:00 2001 From: Charlie O'Keefe Date: Thu, 14 Feb 2019 15:30:11 -0700 Subject: [PATCH] Remove ssh portion of "GPG and SSH" section The parts about ssh here are now addressed by the above walkthrough of ssh-agent forwarding. --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b4a095e..78389dd 100644 --- a/README.md +++ b/README.md @@ -318,14 +318,12 @@ After the build successfully completes, the gitian command `gsign` will be calle Signatures can be verified by running `gitian-build.sh --verify`, but set `build=false` in the script to skip building. Run a `git pull` beforehand on `gitian.sigs` so you have the latest. The provisioning includes a task which imports Zcash developer public keys to the Vagrant user's keyring and sets them to ultimately trusted, but they can also be found at `contrib/gitian-downloader` within the Zcash source repository. -Working with GPG and SSH --------------------------- +Working with GPG +---------------- -We provide two options for automatically importing keys into the VM, or you may choose to copy them manually. Keys are needed A) to sign the manifests which get pushed to [gitian.sigs](https://github.com/zcash/gitian.sigs) and B) to interact with GitHub, if you choose to use an SSH instead of HTTPS remote. The latter would entail always providing your GitHub login and [access token](https://github.com/settings/tokens) in order to push from within the VM. +We provide two options for automatically importing keys into the VM, or you may choose to copy them manually. GPG keys are needed to sign the manifests which get pushed to [gitian.sigs](https://github.com/zcash/gitian.sigs). -Your local SSH agent is automatically forwarded into the VM via a configuration option. If you run ssh-agent, your keys should already be available. - -GPG is trickier, especially if you use a smartcard and can't copy the secret key. We have a script intended to forward the gpg-agent socket into the VM, `forward_gpg_agent.sh`, but it is not currently working. If you want your full keyring to be available, you can use the following workaround involving `sshfs` and synced folders: +GPG is tricky, especially if you use a smartcard and can't copy the secret key. We have a script intended to forward the gpg-agent socket into the VM, `forward_gpg_agent.sh`, but it is not currently working. If you want your full keyring to be available, you can use the following workaround involving `sshfs` and synced folders: vagrant plugin install vagrant-sshfs