diff --git a/CHANGELOG.md b/CHANGELOG.md index bf227579b..dbf1e73ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ ## Component Updates and Bug Fixes - +* github.com/openziti/ziti: [v0.30.3 -> v0.30.4](https://github.com/openziti/ziti/compare/v0.30.3...v0.30.4) + * Fixed an issue causing router configs to be rewritten when docker compose was brought up with existing configs # Release 0.30.3 diff --git a/quickstart/docker/image/run-router.sh b/quickstart/docker/image/run-router.sh index f38bfc664..eb25c4fc1 100755 --- a/quickstart/docker/image/run-router.sh +++ b/quickstart/docker/image/run-router.sh @@ -30,9 +30,10 @@ if [[ "${_ZITI_ROUTER_NAME}" != "" ]]; then export ZITI_ROUTER_NAME="${_ZITI_ROUTER_NAME}" echo "ZITI_ROUTER_NAME set to: ${ZITI_ROUTER_NAME}" fi -_UNIQUE_NAME="${ZITI_HOME}/${ZITI_ROUTER_NAME}-${HOSTNAME}.init" -if [ ! -f "${_UNIQUE_NAME}" ]; then - echo "system has not been initialized. initializing..." + +_CONFIG_PATH="${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml" +if [ ! -f "${_CONFIG_PATH}" ]; then + echo "config has not been generated, generating config..." "${ZITI_BIN_DIR-}/ziti" edge login ${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS}:${ZITI_CTRL_EDGE_ADVERTISED_PORT} -u $ZITI_USER -p $ZITI_PWD -y echo "---------- Creating edge-router ${ZITI_ROUTER_NAME}...." @@ -64,10 +65,8 @@ if [ ! -f "${_UNIQUE_NAME}" ]; then "${ZITI_BIN_DIR}/ziti" router enroll "${ZITI_HOME}/${ZITI_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_ROUTER_NAME}.jwt" echo "" fi - echo "system initialized. writing marker file" - echo "system initialized" > "${_UNIQUE_NAME}" else - echo "system has been initialized. starting the process." + echo " Found existing config file ${_CONFIG_PATH}, not creating a new config." fi unset ZITI_USER diff --git a/ziti/cmd/pki/pki_create_ca.go b/ziti/cmd/pki/pki_create_ca.go index 8a0c6cabe..575680ff1 100644 --- a/ziti/cmd/pki/pki_create_ca.go +++ b/ziti/cmd/pki/pki_create_ca.go @@ -98,7 +98,7 @@ func (o *PKICreateCAOptions) Run() error { //default name, ensure uniqueness by adding a random id o.Flags.CAName = o.Flags.CAName + " " + idgen.New() } - + commonName := o.Flags.CAName filename := o.ObtainFileName(caFile, commonName)