From ff5421894ced64582bc2b427e87b19a7a801c0bd Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Tue, 5 Oct 2021 05:20:51 -0700
Subject: [PATCH] Remove unused envoy IP/port vars from squeaknode app (#1019)

---
 scripts/configure             | 4 ----
 templates/.env-sample         | 2 --
 templates/torrc-apps-3-sample | 1 -
 3 files changed, 7 deletions(-)

diff --git a/scripts/configure b/scripts/configure
index bb52eeb..37b9002 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -202,8 +202,6 @@ APP_SQUEAKNODE_PORT="12994"
 APP_SQUEAKNODE_GRPC_PORT="8994"
 APP_SQUEAKNODE_P2P_PORT="8555"
 APP_SQUEAKNODE_P2P_TESTNET_PORT="18555"
-APP_SQUEAKNODE_ENVOY_IP="10.21.21.55"
-APP_SQUEAKNODE_ENVOY_PORT="15081"
 
 # Generate RPC credentials
 if [[ -z ${BITCOIN_RPC_USER+x} ]] || [[ -z ${BITCOIN_RPC_PASS+x} ]] || [[ -z ${BITCOIN_RPC_AUTH+x} ]]; then
@@ -403,8 +401,6 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "
   sed -i "s/<app-squeaknode-grpc-port>/${APP_SQUEAKNODE_GRPC_PORT}/g" "${template}"
   sed -i "s/<app-squeaknode-p2p-port>/${APP_SQUEAKNODE_P2P_PORT}/g" "${template}"
   sed -i "s/<app-squeaknode-p2p-testnet-port>/${APP_SQUEAKNODE_P2P_TESTNET_PORT}/g" "${template}"
-  sed -i "s/<app-squeaknode-envoy-ip>/${APP_SQUEAKNODE_ENVOY_IP}/g" "${template}"
-  sed -i "s/<app-squeaknode-envoy-port>/${APP_SQUEAKNODE_ENVOY_PORT}/g" "${template}"
 done
 
 ##########################################################
diff --git a/templates/.env-sample b/templates/.env-sample
index 91b3c5d..725b447 100644
--- a/templates/.env-sample
+++ b/templates/.env-sample
@@ -96,5 +96,3 @@ APP_SQUEAKNODE_PORT=<app-squeaknode-port>
 APP_SQUEAKNODE_GRPC_PORT=<app-squeaknode-grpc-port>
 APP_SQUEAKNODE_P2P_PORT=<app-squeaknode-p2p-port>
 APP_SQUEAKNODE_P2P_TESTNET_PORT=<app-squeaknode-p2p-testnet-port>
-APP_SQUEAKNODE_ENVOY_IP=<app-squeaknode-envoy-ip>
-APP_SQUEAKNODE_ENVOY_PORT=<app-squeaknode-envoy-port>
diff --git a/templates/torrc-apps-3-sample b/templates/torrc-apps-3-sample
index 0043d5b..8d74001 100644
--- a/templates/torrc-apps-3-sample
+++ b/templates/torrc-apps-3-sample
@@ -15,7 +15,6 @@ HiddenServicePort 80 <app-code-server-ip>:8080
 # squeaknode Hidden Service
 HiddenServiceDir /var/lib/tor/app-squeaknode
 HiddenServicePort 80 <app-squeaknode-ip>:<app-squeaknode-port>
-HiddenServicePort <app-squeaknode-envoy-port> <app-squeaknode-envoy-ip>:<app-squeaknode-envoy-port>
 
 # squeaknode p2p Hidden Service
 HiddenServiceDir /var/lib/tor/app-squeaknode-p2p