From 2908afdd18f0711bcc8bf880f790e8a40b372827 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Mon, 10 May 2021 08:30:33 -0400
Subject: [PATCH] allow IP override as well

---
 quickstart/docker/image/create-pki.sh        | 17 +++++++++--------
 quickstart/docker/image/create-router-pki.sh |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/quickstart/docker/image/create-pki.sh b/quickstart/docker/image/create-pki.sh
index 3a63c943e..370c181f3 100755
--- a/quickstart/docker/image/create-pki.sh
+++ b/quickstart/docker/image/create-pki.sh
@@ -2,12 +2,17 @@
 function pki_client_server {
   name_local=$1
   ZITI_CA_NAME_local=$2
+  ip_local=$3
+
+  if [[ "${ip_local}" == "" ]]; then
+    ip_local="127.0.0.1"
+  fi
 
   if ! test -f "${ZITI_PKI}/${ZITI_CA_NAME_local}/keys/${name_local}-server.key"; then
     echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
     ziti pki create server --pki-root="${ZITI_PKI}" --ca-name "${ZITI_CA_NAME_local}" \
           --server-file "${name_local}-server" \
-          --dns "${name_local},localhost" --ip 127.0.0.1 \
+          --dns "${name_local},localhost" --ip "${ip_local}" \
           --server-name "${name_local} server certificate"
   else
     echo "Creating server cert from ca: ${ZITI_CA_NAME_local} for ${name_local}"
@@ -72,10 +77,6 @@ else
 fi
 echo " "
 
-pki_client_server "${ZITI_CONTROLLER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}"
-pki_client_server "${ZITI_EDGE_CONTROLLER_HOSTNAME}" "${ZITI_EDGE_CONTROLLER_INTERMEDIATE_NAME}"
-pki_client_server "${ZITI_EDGE_ROUTER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}"
-#pki_client_server "${ZITI_EDGE_WSS_ROUTER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}"
-#pki_client_server "${ZITI_ROUTER_BR_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}"
-#pki_client_server "${ZITI_ROUTER_RED_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}"
-#pki_client_server "${ZITI_ZAC_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}"
+pki_client_server "${ZITI_CONTROLLER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}" "${ZITI_CONTROLLER_IP_OVERRIDE}"
+pki_client_server "${ZITI_EDGE_CONTROLLER_HOSTNAME}" "${ZITI_EDGE_CONTROLLER_INTERMEDIATE_NAME}" "${ZITI_EDGE_CONTROLLER_IP_OVERRIDE}"
+#pki_client_server "${ZITI_EDGE_ROUTER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}" "${ZITI_EDGE_ROUTER_IP_OVERRIDE}"
diff --git a/quickstart/docker/image/create-router-pki.sh b/quickstart/docker/image/create-router-pki.sh
index 6afc105da..620ed1b5b 100755
--- a/quickstart/docker/image/create-router-pki.sh
+++ b/quickstart/docker/image/create-router-pki.sh
@@ -27,4 +27,4 @@ function pki_client_server {
   echo " "
 }
 
-pki_client_server "${ZITI_EDGE_ROUTER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}"
+pki_client_server "${ZITI_EDGE_ROUTER_HOSTNAME}" "${ZITI_CONTROLLER_INTERMEDIATE_NAME}" "${ZITI_EDGE_ROUTER_IP_OVERRIDE}"