github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1667 from u2mejc/u2mejc-certs

Browse Source 
Fix dokku certs:add file input bug
This commit is contained in:
Jose Diaz-Gonzalez
2015-11-10 20:16:54 -05:00
parent acbd1b8655 b7fbd9aea0
commit ffbb2f3c42
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/certs/commands
View File

@@ -11,11 +11,17 @@ is_tar_import() {
} }
is_file_import() { is_file_import() {
local CRT_FILE="$3" local CRT_FILE="$1"
local KEY_FILE="$4" local KEY_FILE="$2"
if [[ -f $CRT_FILE ]] && [[ -f $KEY_FILE ]]; then if [[ $CRT_FILE ]] && [[ $KEY_FILE ]]; then
return 0 if [[ ! -f $CRT_FILE ]]; then
dokku_log_fail "CRT file specified not found, please check file paths"
elif [[ ! -f $KEY_FILE ]]; then
dokku_log_fail "KEY file specified not found, please check file paths"
else
return 0
fi
fi fi
return 1 return 1
@@ -55,8 +61,8 @@ certs_set() {
fi fi
mkdir -p "$DOKKU_ROOT/$APP/tls" mkdir -p "$DOKKU_ROOT/$APP/tls"
mv "$CRT_FILE" "$DOKKU_ROOT/$APP/tls/server.crt" cp "$CRT_FILE" "$DOKKU_ROOT/$APP/tls/server.crt"
mv "$KEY_FILE" "$DOKKU_ROOT/$APP/tls/server.key" cp "$KEY_FILE" "$DOKKU_ROOT/$APP/tls/server.key"
cd $DOKKU_ROOT cd $DOKKU_ROOT
rm -rf $TEMP_DIR rm -rf $TEMP_DIR
nginx_build_config $APP nginx_build_config $APP