diff --git a/quickstart/docker/image/create-edge-router-config.sh b/quickstart/docker/image/create-edge-router-config.sh index dd83bcaf1..b304a38d9 100755 --- a/quickstart/docker/image/create-edge-router-config.sh +++ b/quickstart/docker/image/create-edge-router-config.sh @@ -1,6 +1,6 @@ #!/bin/bash cat > ${ZITI_HOME}/${ZITI_EDGE_ROUTER_NAME}.yaml < $ZITI_HOME/identities.yml -echo "v: 2 +echo "v: 3 identity: cert: ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_ROUTER_BR_HOSTNAME}-client.cert @@ -28,7 +28,7 @@ link: listener: tls:${ZITI_ROUTER_BR_HOSTNAME}:6001 " > $ZITI_HOME/${ZITI_ROUTER_BR_NAME}.yaml -echo "v: 2 +echo "v: 3 identity: cert: ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_ROUTER_BLUE_HOSTNAME}-client.cert @@ -41,7 +41,7 @@ ctrl: " > $ZITI_HOME/${ZITI_ROUTER_BLUE_NAME}.yaml -echo "v: 2 +echo "v: 3 identity: cert: ${ZITI_PKI}/${ZITI_CONTROLLER_INTERMEDIATE_NAME}/certs/${ZITI_ROUTER_RED_HOSTNAME}-client.cert diff --git a/quickstart/local/init.sh b/quickstart/local/init.sh index c076a32f1..ffa470c65 100755 --- a/quickstart/local/init.sh +++ b/quickstart/local/init.sh @@ -99,5 +99,7 @@ export PS1="ZITI IS RUNNING: " echo "adding pki-functions to bash shell" . ${curdir}/pki-functions.sh +alias zec='ziti edge controller' + HERE ) diff --git a/quickstart/local/prep-ziti.sh b/quickstart/local/prep-ziti.sh index 16f839d39..5e5ff41fc 100644 --- a/quickstart/local/prep-ziti.sh +++ b/quickstart/local/prep-ziti.sh @@ -1,9 +1,7 @@ # if needed, initialize the controller ziti-controller edge init "${ZITI_HOME}/controller.yaml" -u "${ZITI_USER}" -p "${ZITI_PWD}" -# tail all the log files that will be created to see any issues mkdir -p ${ZITI_HOME} -tail -F ${ZITI_HOME}/ziti-*log & # run the controller ziti-controller run "${ZITI_HOME}/controller.yaml" > "${ZITI_HOME}/ziti-controller.log" 2>&1 & diff --git a/quickstart/local/test-ziti.sh b/quickstart/local/test-ziti.sh old mode 100644 new mode 100755 index 7334e353e..db86a426f --- a/quickstart/local/test-ziti.sh +++ b/quickstart/local/test-ziti.sh @@ -1,9 +1,20 @@ -ziti edge controller create config netcat ziti-tunneler-client.v1 '{ "hostname" : "localhost", "port" : 7256 }' +ziti edge controller login "${ZITI_EDGE_API_HOSTNAME}" -u "${ZITI_USER}" -p "${ZITI_PWD}" -c "${ZITI_PKI}/${ZITI_EDGE_ROOTCA_NAME}/certs/${ZITI_EDGE_INTERMEDIATE_NAME}.cert" -ziti edge controller create service netcat7256 --configs netcat +ziti edge controller delete service netcatsvc +ziti edge controller delete service zcatsvc -ziti edge controller create terminator netcat7256 "${ZITI_ROUTER_BR_HOSTNAME}" tcp://localhost:7256 +ziti edge controller delete config netcatconfig +ziti edge controller delete config zcatsvcconfig +ziti edge controller create config netcatconfig ziti-tunneler-client.v1 '{ "hostname" : "localhost", "port" : 7256 }' +ziti edge controller create service netcatsvc --configs netcatconfig +ziti edge controller create terminator netcatsvc "${ZITI_EDGE_ROUTER_NAME}" tcp:localhost:7256 + +ziti edge controller create config zcatconfig ziti-tunneler-client.v1 '{ "hostname" : "zcat", "port" : 7256 }' +ziti edge controller create service zcatsvc --configs zcatconfig +ziti edge controller create terminator zcatsvc "${ZITI_EDGE_ROUTER_NAME}" tcp:localhost:7256 + +ziti edge controller delete identity "test_identity" ziti edge controller create identity device "test_identity" -o "${ZITI_HOME}/test_identity".jwt ziti edge controller create service-policy dial-all Dial --service-roles '#all' --identity-roles '#all'