From 9f3006d331d8b6de2eca4ad5be2037170f5d07ca Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sat, 21 Sep 2024 10:45:39 -0400 Subject: [PATCH 1/3] do not exit after warning --- nfpm/zrok-share.bash | 1 - 1 file changed, 1 deletion(-) diff --git a/nfpm/zrok-share.bash b/nfpm/zrok-share.bash index d245b9fb..0296f87e 100644 --- a/nfpm/zrok-share.bash +++ b/nfpm/zrok-share.bash @@ -174,7 +174,6 @@ if [[ "${ZROK_FRONTEND_MODE:-}" =~ -private$ && "${ZROK_PERMISSION_MODE:-}" == c done else echo "WARNING: ZROK_PERMISSION_MODE='${ZROK_PERMISSION_MODE}' and no additional ZROK_ACCESS_GRANTS; will be granted access" >&2 - exit 1 fi elif [[ "${ZROK_FRONTEND_MODE:-}" =~ -private$ && -n "${ZROK_PERMISSION_MODE:-}" && "${ZROK_PERMISSION_MODE}" != open ]]; then echo "WARNING: ZROK_PERMISSION_MODE='${ZROK_PERMISSION_MODE}' is not a recognized value'" >&2 From 92eaac43a02f12abd6aa9afb9c0fe0b7c111c320 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Sat, 21 Sep 2024 11:51:49 -0400 Subject: [PATCH 2/3] tidy examples --- docs/guides/docker-share/docker_private_share_guide.md | 2 +- nfpm/zrok-share.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/docker-share/docker_private_share_guide.md b/docs/guides/docker-share/docker_private_share_guide.md index d9005f5f..1d7eda86 100644 --- a/docs/guides/docker-share/docker_private_share_guide.md +++ b/docs/guides/docker-share/docker_private_share_guide.md @@ -108,7 +108,7 @@ You must set the permission mode before you reserve the share. Only your own account can access the private share. ```bash -ZROK_PERMISSION_MODE=closed +ZROK_PERMISSION_MODE="closed" ``` Grant access to additional zrok accounts. diff --git a/nfpm/zrok-share.env b/nfpm/zrok-share.env index c54e13a2..c1b0b8f4 100644 --- a/nfpm/zrok-share.env +++ b/nfpm/zrok-share.env @@ -108,7 +108,7 @@ ZROK_TARGET="" # e.g., http://127.0.0.1:3000 #ZROK_FRONTEND_MODE="reserved-public" # you MAY restrict access to a private share allowing only your own zrok account -#ZROK_PERMISSION_MODE=closed +#ZROK_PERMISSION_MODE="closed" # if permission mode "closed" - space-separated list of additional zrok account emails to grant access with the share token #ZROK_ACCESS_GRANTS="" From c5ed090883d1ff5cf60ab1e7fe9ecc928b67bcad Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Thu, 26 Sep 2024 16:14:30 -0400 Subject: [PATCH 3/3] announce fix --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f59151a..7e89470d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ FIX: Fixed crash when invoking `zrok share reserved` with no arguments (https://github.com/openziti/zrok/issues/740) +FIX: zrok-share.service on Linux failed to start with a private share in closed permission mode + ## v0.4.40 FEATURE: New endpoint for synchronizing grants for an account (https://github.com/openziti/zrok/pull/744). Useful for updating the `zrok.proxy.v1` config objects containing interstitial setting when the `skip_interstitial_grants` table has been updated.