fix router auto-renewal; fix router address IP SAN;

openziti · Sep 24, 2024 · d437ccd · d437ccd
1 parent 3b56d73
commit d437ccd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/dist/dist-packages/linux/openziti-router/bootstrap.bash b/dist/dist-packages/linux/openziti-router/bootstrap.bash
@@ -31,6 +31,12 @@ makeConfig() {
           ZITI_ROUTER_PORT \
           ZITI_ROUTER_LISTENER_BIND_PORT="${ZITI_ROUTER_PORT}"
 
+  if [[ "${ZITI_ROUTER_ADVERTISED_ADDRESS}" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    echo "DEBUG: ZITI_ROUTER_ADVERTISED_ADDRESS is an IPv4 address, setting ZITI_ROUTER_IP_OVERRIDE" >&3
+    export ZITI_ROUTER_IP_OVERRIDE="${ZITI_ROUTER_ADVERTISED_ADDRESS}"
+    unset ZITI_ROUTER_ADVERTISED_ADDRESS
+  fi
+
   if [[ ! -s "${_config_file}" || "${1:-}" == --force ]]; then
     # build config command
     local -a _command=("ziti create config router ${ZITI_ROUTER_TYPE}" \
@@ -57,7 +63,6 @@ makeConfig() {
       mv --no-clobber "${_config_file}"{,".${ZITI_BOOTSTRAP_NOW}.old"}
     fi
 
-
     exportZitiVars                # export all ZITI_ vars to be used in bootstrap
     # shellcheck disable=SC2068
     ${_command[@]}

diff --git a/dist/dist-packages/linux/openziti-router/service.env b/dist/dist-packages/linux/openziti-router/service.env
@@ -13,8 +13,5 @@ ZITI_BOOTSTRAP_ENROLLMENT='true'
 # BASH script that defines function bootstrap()
 ZITI_ROUTER_BOOTSTRAP_BASH='/opt/openziti/etc/router/bootstrap.bash'
 
-# renew server and client certificates every startup
-ZITI_AUTO_RENEW_CERTS='true'
-
 # additional arguments to the ExecStart command must be a non-empty string
-ZITI_ARGS='--'
+ZITI_ARGS='--extend'