From 9ef080ea3685aa4d8e8336c3265642a6b9d5677f Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 12 Apr 2024 19:06:24 -0400 Subject: [PATCH] generate controller config with a single default port if no port is specified instead of 1280 for edge, 6262 for ctrl plane --- dist/dist-packages/linux/openziti-controller/bootstrap.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/dist-packages/linux/openziti-controller/bootstrap.bash b/dist/dist-packages/linux/openziti-controller/bootstrap.bash index 867e124b6..6f5b4a27d 100755 --- a/dist/dist-packages/linux/openziti-controller/bootstrap.bash +++ b/dist/dist-packages/linux/openziti-controller/bootstrap.bash @@ -128,7 +128,7 @@ function makeConfig() { # set the URI of the edge-client API (uses same TCP port); e.g., ztAPI: ziti.example.com:1280 export ZITI_CTRL_EDGE_ADVERTISED_ADDRESS="${ZITI_CTRL_ADVERTISED_ADDRESS}" \ - ZITI_CTRL_EDGE_ADVERTISED_PORT="${ZITI_CTRL_ADVERTISED_PORT}" + ZITI_CTRL_EDGE_ADVERTISED_PORT="${ZITI_CTRL_ADVERTISED_PORT:=1280}" # export the vars that were assigned inside this script to set the path to the server and client certs and their common # private key, and the intermediate (signer) CA cert and key @@ -173,7 +173,7 @@ function makeDatabase() { --password "${ZITI_PWD}" else echo "ERROR: need admin password; use LoadCredential in"\ - " /lib/systemd/system/ziti-controller.service or set env var ZITI_PWD with at least 5 characters" >&2 + " /lib/systemd/system/ziti-controller.service or set env var ZITI_PWD" >&2 return 1 fi