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

Use curl in vault_cli.sh, not vault binary

Browse Source 
vault binary is not in a Docker image but curl is.
So it will be possible to do deployment from a Docker container.
This commit is contained in:
Sergey Pashinin 2020-04-21 11:51:53 +03:00
parent dbf659c575
commit 1ef8c0d371
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -8,6 +8,7 @@ RUN apk update -f \
bind-tools \ bind-tools \
curl \ curl \
socat \ socat \
sed \
tzdata \ tzdata \
oath-toolkit-oathtool \ oath-toolkit-oathtool \
tar \ tar \

23
deploy/vault_cli.sh
View File

@ -43,19 +43,22 @@ vault_cli_deploy() {
return 1 return 1
fi fi
VAULT_CMD=$(which vault) # JSON does not allow multiline strings.
if [ ! $? ]; then # So replacing new-lines with "\n" here
_err "cannot find vault binary!" _ckey=$(cat "$2" | sed -z 's/\n/\\n/g')
return 1 _ccert=$(cat "$3" | sed -z 's/\n/\\n/g')
fi _cca=$(cat "$4" | sed -z 's/\n/\\n/g')
_cfullchain=$(cat "$5" | sed -z 's/\n/\\n/g')
URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain"
if [ -n "$FABIO" ]; then if [ -n "$FABIO" ]; then
$VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}" cert=@"$_cfullchain" key=@"$_ckey" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"}" $URL || return 1
else else
$VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/cert.pem" value=@"$_ccert" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ccert\"}" "$URL/cert.pem" || return 1
$VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/cert.key" value=@"$_ckey" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_ckey\"}" "$URL/cert.key" || return 1
$VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/chain.pem" value=@"$_cca" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_cca\"}" "$URL/chain.pem" || return 1
$VAULT_CMD write "${VAULT_PREFIX}/${_cdomain}/fullchain.pem" value=@"$_cfullchain" || return 1 curl --silent -H "X-Vault-Token: $VAULT_TOKEN" --request POST --data "{\"value\": \"$_cfullchain\"}" "$URL/fullchain.pem" || return 1
fi fi
} }