extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-12-31 02:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #753 from openziti/bugfix-linux-service-private-closed

Browse Source 
do not exit after warning
This commit is contained in:
Kenneth Bingham 2024-09-26 16:15:16 -04:00 committed by GitHub
commit 18b33fae38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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.

2
docs/guides/docker-share/docker_private_share_guide.md
View File

@ -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.

1
nfpm/zrok-share.bash
View File

@ -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

2
nfpm/zrok-share.env
View File

@ -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=""