From e5e76e8742b5781eac861387f0da8fcf4e45df77 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Mon, 24 Oct 2022 18:39:25 -0400 Subject: [PATCH] de-quote env script with a heredoc --- doc/004-controller-pki.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/doc/004-controller-pki.md b/doc/004-controller-pki.md index 66153b349..6ed1414ec 100644 --- a/doc/004-controller-pki.md +++ b/doc/004-controller-pki.md @@ -22,20 +22,21 @@ After these are defined an environment folder and 'env' file will be generated t ```bash mkdir -p $ZITI_HOME - echo -e "export ZITI_HOME=${ZITI_HOME}\n\ - export ZITI_NETWORK=${ZITI_NETWORK}\n\ - export ZITI_ID=\"\${ZITI_HOME}/identities.yml\"\n\ - export ZITI_CA_NAME=\"\${ZITI_NETWORK}\"\n\ - export ZITI_PKI=\"\${ZITI_HOME}/pki\"\n\ - export ZITI_CA_FILE=\"\${ZITI_PKI}/\${ZITI_CA_NAME}/certs/\${ZITI_CA_NAME}.cert\"\n\ - export ZITI_CTRL_HOSTNAME=\"\${ZITI_NETWORK}-ctrl.ziti.netfoundry.io\"\n\ - export ZITI_ER01_HOSTNAME=\"\${ZITI_NETWORK}-er01.ziti.netfoundry.io\"\n\ - export ZITI_R01_HOSTNAME=\"\${ZITI_NETWORK}-r01.ziti.netfoundry.io\"\n\ - export ZITI_EDGE_API_PORT=1280\n\ - export ZITI_EDGE_API_HOSTNAME=\"\${ZITI_CTRL_HOSTNAME}:\${ZITI_EDGE_API_PORT}\"\n\ - mkdir -p \$ZITI_HOME/db - mkdir -p \$ZITI_PKI - " > ${ZITI_HOME}/env + cat < ${ZITI_HOME}/env + export ZITI_HOME=${ZITI_HOME} + export ZITI_NETWORK=${ZITI_NETWORK} + export ZITI_ID="${ZITI_HOME}/identities.yml" + export ZITI_CA_NAME="${ZITI_NETWORK}" + export ZITI_PKI="${ZITI_HOME}/pki" + export ZITI_CA_FILE="${ZITI_PKI}/${ZITI_CA_NAME}/certs/${ZITI_CA_NAME}.cert" + export ZITI_CTRL_HOSTNAME="${ZITI_NETWORK}-ctrl.ziti.netfoundry.io" + export ZITI_ER01_HOSTNAME="${ZITI_NETWORK}-er01.ziti.netfoundry.io" + export ZITI_R01_HOSTNAME="${ZITI_NETWORK}-r01.ziti.netfoundry.io" + export ZITI_EDGE_API_PORT=1280 + export ZITI_EDGE_API_HOSTNAME="${ZITI_CTRL_HOSTNAME}:${ZITI_EDGE_API_PORT}" + mkdir -p $ZITI_HOME/db + mkdir -p $ZITI_PKI + SHELL ``` This file generated by the above snippet can be sourced any time to switch between working with multiple environments