plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-11-09 16:01:46 +00:00
Code Issues Projects Releases Wiki Activity

migrate FABIO to VAULT_FABIO_MODE and persist it

Browse Source
This commit is contained in:
PMExtra 2022-12-23 19:32:06 +08:00
parent b8d0d3c242
commit ed63eb6833
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deploy/vault.sh
View File

@ -66,6 +66,8 @@ vault_deploy() {
_savedeployconf VAULT_TOKEN "$VAULT_TOKEN" _savedeployconf VAULT_TOKEN "$VAULT_TOKEN"
fi fi
_migratedeployconf FABIO VAULT_FABIO_MODE
# 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=$(sed -z 's/\n/\\n/g' <"$2") _ckey=$(sed -z 's/\n/\\n/g' <"$2")
@ -86,7 +88,7 @@ vault_deploy() {
URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain" URL="$VAULT_ADDR/v1/$VAULT_PREFIX/$_cdomain"
if [ -n "$FABIO" ]; then if [ -n "$VAULT_FABIO_MODE" ]; then
_info "Writing certificate and key to $URL in Fabio mode" _info "Writing certificate and key to $URL in Fabio mode"
if [ -n "$VAULT_KV_V2" ]; then if [ -n "$VAULT_KV_V2" ]; then
_post "{ \"data\": {\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"} }" "$URL" >/dev/null || return 1 _post "{ \"data\": {\"cert\": \"$_cfullchain\", \"key\": \"$_ckey\"} }" "$URL" >/dev/null || return 1

4
deploy/vault_cli.sh
View File

@ -64,6 +64,8 @@ vault_cli_deploy() {
_savedeployconf VAULT_TOKEN "$VAULT_TOKEN" _savedeployconf VAULT_TOKEN "$VAULT_TOKEN"
fi fi
_migratedeployconf FABIO VAULT_FABIO_MODE
VAULT_CMD=$(command -v vault) VAULT_CMD=$(command -v vault)
if [ ! $? ]; then if [ ! $? ]; then
_err "cannot find vault binary!" _err "cannot find vault binary!"
@ -78,7 +80,7 @@ vault_cli_deploy() {
fi fi
fi fi
if [ -n "$FABIO" ]; then if [ -n "$VAULT_FABIO_MODE" ]; then
_info "Writing certificate and key to $URL in Fabio mode" _info "Writing certificate and key to $URL in Fabio mode"
$VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}" cert=@"$_cfullchain" key=@"$_ckey" || return 1 $VAULT_CMD kv put "${VAULT_PREFIX}/${_cdomain}" cert=@"$_cfullchain" key=@"$_ckey" || return 1
else else