Merge branch 'unboxing' of github.com:netfoundry/ziti-cmd into unboxing

This commit is contained in:
dovholuknf
2021-04-22 22:12:37 -04:00
@@ -172,11 +172,16 @@ function generateEnvFile {
ZITI_FAB_MGMT_PORT="10000"
ZITI_FAB_CTRL_PORT="6262"
ZITI_CONTROLLER_NAME="${ZITI_NETWORK}-controller"
ZITI_CONTROLLER_NAME="${ZITI_NETWORK}"
ZITI_EDGE_NAME="${ZITI_NETWORK}-edge-controller"
ZITI_EDGE_NAME="${ZITI_NETWORK}"
ZITI_EDGE_PORT="1280"
ZITI_ZAC_NAME="${ZITI_NETWORK}-zac"
ZITI_ZAC_NAME="${ZITI_NETWORK}"
ZITI_EDGE_ROUTER_NAME="${ZITI_NETWORK}-edge-router"
ZITI_EDGE_ROUTER_NAME="${ZITI_NETWORK}"
ZITI_EDGE_WSS_ROUTER_NAME="${ZITI_NETWORK}-edge-wss-router"
ZITI_EDGE_WSS_ROUTER_NAME="${ZITI_NETWORK}"
ZITI_ROUTER_BR_NAME="${ZITI_NETWORK}-fabric-router-br"
ZITI_ROUTER_BLUE_NAME="${ZITI_NETWORK}-fabric-router-blue"
ZITI_ROUTER_RED_NAME="${ZITI_NETWORK}-fabric-router-red"