Merge pull request #3755 from dean1012/issue-3717

Warn if key_file is missing on install but do not exit
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2019-10-22 22:30:23 -04:00
commit accfc3b793
2 files changed
+5 -3

No files matched your search

+3
View File
@@ -91,6 +91,9 @@ A fresh VM running any of the following operating systems:
- CentOS 7 x64 *(experimental)* - CentOS 7 x64 *(experimental)*
- Arch Linux 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 ## Installation
To install the latest stable release, run the following commands as a user who has access to `sudo`: To install the latest stable release, run the following commands as a user who has access to `sudo`:
+2 -3
View File
@@ -60,10 +60,9 @@ case "$1" in
if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then if [ -z "${DEBCONF_RECONFIGURE}" ] && [ "$RET" != "true" ]; then
db_get "dokku/key_file" db_get "dokku/key_file"
if [ ! -f "$RET" ]; then if [ ! -f "$RET" ]; then
echo "Error: keyfile '$RET' not found." echo "Error: keyfile '$RET' not found." >&2
echo " you can enter a new keyfile path when you restart the installation." echo " To deploy, you will need to generate a keypair and add with 'dokku ssh-keys:add'."
db_reset "dokku/key_file" db_reset "dokku/key_file"
exit 1
fi fi
fi fi
;; ;;