From 80b20ec4c15db8d662fc39e67d367112e3930ecd Mon Sep 17 00:00:00 2001 From: Jerry Smith Date: Tue, 22 Oct 2019 20:22:03 -0500 Subject: [PATCH] Fixes for issue #3717 * Adjusts documentation * Changes error messages when ssh key is not present * Moves error messages to stderr * Removes erroneous exit line --- README.md | 3 +++ debian/preinst | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f3a245c63..f2098f8af 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,9 @@ A fresh VM running any of the following operating systems: - CentOS 7 x64 *(experimental)* - Arch Linux x64 *(experimental)* +An SSH keypair that can be used for application deployment. If this exists before installation, it will be automatically imported into dokku. +Otherwise, you will need to import the keypair manually after installation using `dokku ssh-keys:add`. + ## Installation To install the latest stable release, run the following commands as a user who has access to `sudo`: diff --git a/debian/preinst b/debian/preinst index 3baaba9aa..523172e4c 100755 --- a/debian/preinst +++ b/debian/preinst @@ -60,10 +60,9 @@ case "$1" in if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then db_get "dokku/key_file" if [ ! -f "$RET" ]; then - echo "Error: keyfile '$RET' not found." - echo " you can enter a new keyfile path when you restart the installation." + echo "Error: keyfile '$RET' not found." >&2 + echo " To deploy, you will need to generate a keypair and add with 'dokku ssh-keys:add'." db_reset "dokku/key_file" - exit 1 fi fi ;;