ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SC2002 and SC2086

Browse Source
This commit is contained in:
Sergey Pashinin 2020-05-15 04:04:14 +03:00
parent 1ef8c0d371
commit 09b4b0348f
No known key found for this signature in database
GPG Key ID: 3C0D84EA2D933E47
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deploy/vault_cli.sh
View File

@ -45,15 +45,15 @@ vault_cli_deploy() {
# JSON does not allow multiline strings. # JSON does not allow multiline strings.
# So replacing new-lines with "\n" here # So replacing new-lines with "\n" here
_ckey=$(cat "$2" | sed -z 's/\n/\\n/g') _ckey=$(sed -z 's/\n/\\n/g' < "$2")
_ccert=$(cat "$3" | sed -z 's/\n/\\n/g') _ccert=$(sed -z 's/\n/\\n/g' < "$3")
_cca=$(cat "$4" | sed -z 's/\n/\\n/g') _cca=$(sed -z 's/\n/\\n/g' < "$4")
_cfullchain=$(cat "$5" | sed -z 's/\n/\\n/g') _cfullchain=$(sed -z 's/\n/\\n/g' < "$5")
URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain" URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain"
if [ -n "$FABIO" ]; then if [ -n "$FABIO" ]; then
curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" $URL || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" "$URL" || return 1
else else
curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ccert\"}" "$URL/cert.pem" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ccert\"}" "$URL/cert.pem" || return 1
curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ckey\"}" "$URL/cert.key" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ckey\"}" "$URL/cert.key" || return 1