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

Merge pull request #2275 from sseemayer/master

Browse Source 
Prefer file import in certs:add if files given
This commit is contained in:
Michael Hobbs
2016-06-27 10:13:25 -07:00
committed by GitHub
parent 80d13234f9 f0000a18ba
commit 6543f5d11c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/certs/subcommands/add
View File

@@ -34,9 +34,12 @@ certs_set() {
verify_app_name "$2" verify_app_name "$2"
local APP="$2"; local CRT_FILE="$3"; local KEY_FILE="$4"; local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls" local APP="$2"; local CRT_FILE="$3"; local KEY_FILE="$4"; local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
is_file_import "$CRT_FILE" "$KEY_FILE" || is_tar_import || dokku_log_fail "Tar archive containing server.crt and server.key expected on stdin"
if is_tar_import; then if is_file_import "$CRT_FILE" "$KEY_FILE"; then
# importing from file
true
elif is_tar_import; then
local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs_set.XXXX") local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs_set.XXXX")
pushd "$CERTS_SET_TMP_WORK_DIR" &> /dev/null pushd "$CERTS_SET_TMP_WORK_DIR" &> /dev/null
trap 'popd &> /dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR > /dev/null' RETURN trap 'popd &> /dev/null || true; rm -rf $CERTS_SET_TMP_WORK_DIR > /dev/null' RETURN
@@ -61,6 +64,10 @@ certs_set() {
else else
local KEY_FILE=$KEY_FILE_SEARCH local KEY_FILE=$KEY_FILE_SEARCH
fi fi
else
dokku_log_fail "Tar archive containing server.crt and server.key expected on stdin"
fi fi
mkdir -p "$APP_SSL_PATH" mkdir -p "$APP_SSL_PATH"