From 32333aef984d80e93326496722e59f321607d361 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Mon, 11 Dec 2023 15:36:19 -0500 Subject: [PATCH] optionally exit when only reserving so we can host with the SDK and do not need a proxy --- nfpm/zrok-share.bash | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/nfpm/zrok-share.bash b/nfpm/zrok-share.bash index 38fefa0f..10b68774 100644 --- a/nfpm/zrok-share.bash +++ b/nfpm/zrok-share.bash @@ -25,6 +25,10 @@ fi # set HOME to the first colon-sep dir in STATE_DIRECTORY inherited from systemd (/var/lib/zrok-share) or docker (/mnt) export HOME="${STATE_DIRECTORY%:*}" +: "${ZROK_SHARE_RESERVED:=true}" + +echo "DEBUG: ZROK_SHARE_RESERVED=${ZROK_SHARE_RESERVED}" + if (( $# )); then if [[ -s "$1" ]]; then echo "INFO: reading share configuration from $1" @@ -60,9 +64,14 @@ elif [[ -s ~/.zrok/reserved.json ]]; then exit 1 else echo "INFO: zrok backend is already reserved: ${ZROK_RESERVED_TOKEN}" - ZITI_CMD="${ZROK_RESERVED_TOKEN} ${ZROK_TARGET}" - ZITI_CMD+=" ${ZROK_VERBOSE:-} ${ZROK_INSECURE:-}" - share_reserved ${ZITI_CMD} + ZROK_CMD="${ZROK_RESERVED_TOKEN} ${ZROK_TARGET}" + ZROK_CMD+=" ${ZROK_VERBOSE:-} ${ZROK_INSECURE:-}" + if [[ "${ZROK_SHARE_RESERVED}" == true ]]; then + share_reserved ${ZROK_CMD} + else + echo "INFO: finished reserving zrok backend, continuing without sharing" + exit 0 + fi fi else ZROK_CMD="reserve public --json-output ${ZROK_VERBOSE:-}" @@ -154,6 +163,11 @@ else fi ZROK_CMD="${ZROK_RESERVED_TOKEN} ${ZROK_TARGET}" ZROK_CMD+=" ${ZROK_VERBOSE:-} ${ZROK_INSECURE:-}" - share_reserved ${ZROK_CMD} + if [[ "${ZROK_SHARE_RESERVED}" == true ]]; then + share_reserved ${ZROK_CMD} + else + echo "INFO: finished reserving zrok backend, continuing without sharing" + exit 0 + fi fi fi