From 3591224560a07b51b1770bde36066d2b75357af5 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Thu, 10 Oct 2024 11:19:51 -0400
Subject: [PATCH 1/2] always append common cli opts

---
 nfpm/zrok-share.bash | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/nfpm/zrok-share.bash b/nfpm/zrok-share.bash
index 0296f87e..764b8d01 100644
--- a/nfpm/zrok-share.bash
+++ b/nfpm/zrok-share.bash
@@ -7,14 +7,19 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-share_reserved(){
+exec_with_common_opts(){
+    local zrok_cmd="$* --headless ${ZROK_VERBOSE:-} ${ZROK_INSECURE:-}"
+    echo "INFO: running: zrok ${zrok_cmd}"
+    exec zrok ${zrok_cmd}
+}
+
+exec_share_reserved(){
     local token="$1"
     local target="$2"
     shift 2
     local opts="${*:-}"
-    local zrok_cmd="share reserved ${token} --headless ${opts} --override-endpoint ${target}"
-    echo "INFO: running: zrok ${zrok_cmd}"
-    exec zrok ${zrok_cmd}
+    local zrok_cmd="share reserved ${token} ${opts} --override-endpoint ${target}"
+    exec_with_common_opts ${zrok_cmd}
 }
 
 if ! command -v jq &>/dev/null; then
@@ -62,9 +67,9 @@ fi
 # default mode is 'reserved-public', override modes are reserved-private, temp-public, temp-private.
 : "${ZROK_FRONTEND_MODE:=reserved-public}"
 if [[ "${ZROK_FRONTEND_MODE:-}" == temp-public ]]; then
-  ZROK_CMD="share public --headless ${ZROK_VERBOSE:-}"
+  ZROK_CMD="share public"
 elif [[ "${ZROK_FRONTEND_MODE:-}" == temp-private ]]; then
-  ZROK_CMD="share private --headless ${ZROK_VERBOSE:-}"
+  ZROK_CMD="share private"
 elif [[ -s ~/.zrok/reserved.json ]]; then
   ZROK_RESERVED_TOKEN="$(jq -r '.token' ~/.zrok/reserved.json 2>/dev/null)"
   if [[ -z "${ZROK_RESERVED_TOKEN}" || "${ZROK_RESERVED_TOKEN}" == null ]]; then
@@ -73,9 +78,8 @@ elif [[ -s ~/.zrok/reserved.json ]]; then
   else
     echo "INFO: zrok backend is already reserved: ${ZROK_RESERVED_TOKEN}"
     ZROK_CMD="${ZROK_RESERVED_TOKEN} ${ZROK_TARGET}"
-    ZROK_CMD+=" ${ZROK_VERBOSE:-} ${ZROK_INSECURE:-}"
     if [[ "${ZROK_SHARE_RESERVED}" == true ]]; then
-      share_reserved ${ZROK_CMD}
+      exec_share_reserved ${ZROK_CMD}
     else
       echo "INFO: finished reserving zrok backend, continuing without sharing"
       exit 0
@@ -198,12 +202,10 @@ elif [[ -n "${ZROK_BASIC_AUTH:-}" ]]; then
   ZROK_CMD+=" --basic-auth ${ZROK_BASIC_AUTH}"
 fi
 
-echo "INFO: running: zrok ${ZROK_CMD}"
-
 if [[ "${ZROK_FRONTEND_MODE:-}" =~ ^temp- ]]; then
   # frontend mode starts with 'temp-', so is temporary.
   # share without reserving until exit.
-  exec zrok ${ZROK_CMD}
+  exec_with_common_opts ${ZROK_CMD}
 else
   # reserve and continue
   zrok ${ZROK_CMD} > ~/.zrok/reserved.json
@@ -228,9 +230,8 @@ else
       exit 1
     fi
     ZROK_CMD="${ZROK_RESERVED_TOKEN} ${ZROK_TARGET}"
-    ZROK_CMD+=" ${ZROK_VERBOSE:-} ${ZROK_INSECURE:-}"
     if [[ "${ZROK_SHARE_RESERVED}" == true ]]; then
-      share_reserved ${ZROK_CMD}
+      exec_share_reserved ${ZROK_CMD}
     else
       echo "INFO: finished reserving zrok backend, continuing without sharing"
       exit 0

From 17d3b07bc8ec0fa5068e7f85bf83d4e54d0d6e6d Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Thu, 10 Oct 2024 11:27:29 -0400
Subject: [PATCH 2/2] announce fix

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd17fae2..516a1c2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v0.4.42
+
+FIX: always append common options like `--headless` and conditionally append `--verbose --insecure` if their respective env vars are set to when running in a service manager like systemd or Docker and wrapping the `zrok` command with the `zrok-share.bash` shell script (https://openziti.discourse.group/t/question-about-reserved-public-vs-temp-public-shares/3169)
+
 ## v0.4.41
 
 FIX: Fixed crash when invoking `zrok share reserved` with no arguments (https://github.com/openziti/zrok/issues/740)