From b45efe67fc8844ec22220dd3457699f2cc011590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Loun=C3=A8s=20Ksouri?= Date: Thu, 11 Feb 2021 19:17:10 +0100 Subject: [PATCH] Handle environment variables allowing to use custom IP and ports for tor and nginx containers --- docker/my-dojo/node/keys.index.js | 10 +++++++++- docker/my-dojo/whirlpool/restart.sh | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docker/my-dojo/node/keys.index.js b/docker/my-dojo/node/keys.index.js index e37a1f3..fbef543 100644 --- a/docker/my-dojo/node/keys.index.js +++ b/docker/my-dojo/node/keys.index.js @@ -22,6 +22,14 @@ if (process.env.EXPLORER_INSTALL == 'on') { } catch(e) {} } +// Retrieve Tor proxy from environment variables or set to defaults +let torIP = (process.env.TOR_PROXY_IP) + ? process.env.TOR_PROXY_IP + : '172.28.1.4' + +let torPort = (process.env.TOR_PROXY_PORT) + ? process.env.TOR_PROXY_PORT + : '9050' /** * Desired structure of /keys/index.js, which is ignored in the repository. @@ -190,7 +198,7 @@ module.exports = { }, // Use a SOCKS5 proxy for all communications with external services // Values: null if no socks5 proxy used, otherwise the url of the socks5 proxy - socks5Proxy: 'socks5h://172.28.1.4:9050', + socks5Proxy: `socks5h://${torIP}:${torPort}`, // OXT (mainnet) oxt: process.env.NODE_URL_OXT_API, // Esplora (testnet) diff --git a/docker/my-dojo/whirlpool/restart.sh b/docker/my-dojo/whirlpool/restart.sh index ee0469e..df9715d 100644 --- a/docker/my-dojo/whirlpool/restart.sh +++ b/docker/my-dojo/whirlpool/restart.sh @@ -16,10 +16,10 @@ whirlpool_options=( if [ "$COMMON_BTC_NETWORK" == "testnet" ]; then whirlpool_options+=(--cli.server="TESTNET") - whirlpool_options+=(--cli.dojo.url="http://172.30.1.3:80/test/v2/") + whirlpool_options+=(--cli.dojo.url="http://${NGINX_IP:-172.30.1.3}:80/test/v2/") else whirlpool_options+=(--cli.server="MAINNET") - whirlpool_options+=(--cli.dojo.url="http://172.30.1.3:80/v2/") + whirlpool_options+=(--cli.dojo.url="http://${NGINX_IP:-172.30.1.3}:80/v2/") fi if [ "$WHIRLPOOL_RESYNC" == "on" ]; then