From 05f43ed79110ab9bb4880a2f05b071eacd50e76a Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 23 Apr 2021 14:11:54 -0400 Subject: [PATCH] name->hostname and fix HOME usage --- quickstart/docker/image/run-edge-router.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/quickstart/docker/image/run-edge-router.sh b/quickstart/docker/image/run-edge-router.sh index 1e2ae59ed..14bdadc98 100755 --- a/quickstart/docker/image/run-edge-router.sh +++ b/quickstart/docker/image/run-edge-router.sh @@ -10,13 +10,14 @@ echo "logging into ziti controller: ${ZITI_EDGE_API_HOSTNAME}" ziti edge login "${ZITI_EDGE_CONTROLLER_API}" -u "${ZITI_USER}" -p "${ZITI_PWD}" -c "${ZITI_PKI}/${ZITI_EDGE_CONTROLLER_ROOTCA_NAME}/certs/${ZITI_EDGE_CONTROLLER_INTERMEDIATE_NAME}.cert" echo "CREATING CONFIG" -"${HOME}/create-edge-router-config.sh" +"/openziti/create-edge-router-config.sh" -echo "---------- Creating edge-router ${ZITI_EDGE_ROUTER_NAME}...." -ziti edge controller create edge-router "${ZITI_EDGE_ROUTER_NAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.jwt" -t +echo "---------- Creating edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...." +ziti edge controller create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t sleep 1 -echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_NAME}...." -ziti-router enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.jwt" &> "${ZITI_EDGE_ROUTER_NAME}.enrollment.log" +echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...." +ziti-router enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" echo "" sleep 1 -ziti-router run "${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.yaml" > "${ZITI_HOME}/ziti-${ZITI_EDGE_ROUTER_NAME}.log" +ziti-router run "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" > "${ZITI_HOME}/ziti-${ZITI_EDGE_ROUTER_HOSTNAME}.log" +