extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-02-14 01:09:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1_0_0' into ui100

Browse Source
This commit is contained in:
Michael Quigley 2024-12-02 10:45:27 -05:00
commit 381eef21f7
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -20,6 +20,8 @@ FIX: Document unique names
FIX: reduce Docker image sizes (https://github.com/openziti/zrok/pull/783) FIX: reduce Docker image sizes (https://github.com/openziti/zrok/pull/783)
FIX: Docker reserved private share startup error (https://github.com/openziti/zrok/pull/801)
FIX: Correct the download URL for the armv7 Linux release (https://github.com/openziti/zrok/issues/782) FIX: Correct the download URL for the armv7 Linux release (https://github.com/openziti/zrok/issues/782)
CHANGE: briefly mention the backend modes that apply to public and private share concepts CHANGE: briefly mention the backend modes that apply to public and private share concepts

14
nfpm/zrok-share.bash
View File

@ -217,12 +217,14 @@ else
echo "ERROR: invalid JSON in $(realpath ~/.zrok)/reserved.json" >&2 echo "ERROR: invalid JSON in $(realpath ~/.zrok)/reserved.json" >&2
exit 1 exit 1
else else
ZROK_PUBLIC_URLS=$(jq -cr '.frontend_endpoints' ~/.zrok/reserved.json 2>/dev/null) if [[ "${ZROK_FRONTEND_MODE:-}" == reserved-public ]]; then
if [[ -z "${ZROK_PUBLIC_URLS}" || "${ZROK_PUBLIC_URLS}" == null ]]; then ZROK_PUBLIC_URLS=$(jq -cr '.frontend_endpoints' ~/.zrok/reserved.json 2>/dev/null)
echo "ERROR: frontend endpoints not defined in $(realpath ~/.zrok)/reserved.json" >&2 if [[ -z "${ZROK_PUBLIC_URLS}" || "${ZROK_PUBLIC_URLS}" == null ]]; then
exit 1 echo "ERROR: frontend endpoints not defined in $(realpath ~/.zrok)/reserved.json" >&2
else exit 1
echo "INFO: zrok public URLs: ${ZROK_PUBLIC_URLS}" else
echo "INFO: zrok public URLs: ${ZROK_PUBLIC_URLS}"
fi
fi fi
ZROK_RESERVED_TOKEN=$(jq -r '.token' ~/.zrok/reserved.json 2>/dev/null) ZROK_RESERVED_TOKEN=$(jq -r '.token' ~/.zrok/reserved.json 2>/dev/null)
if [[ -z "${ZROK_RESERVED_TOKEN}" || "${ZROK_RESERVED_TOKEN}" == null ]]; then if [[ -z "${ZROK_RESERVED_TOKEN}" || "${ZROK_RESERVED_TOKEN}" == null ]]; then