diff --git a/apps/btcpay-server/docker-compose.yml b/apps/btcpay-server/docker-compose.yml index 3472420..4169bca 100644 --- a/apps/btcpay-server/docker-compose.yml +++ b/apps/btcpay-server/docker-compose.yml @@ -26,6 +26,9 @@ services: NBXPLORER_BTCNODEENDPOINT: $BITCOIN_IP:$BITCOIN_P2P_PORT NBXPLORER_BTCRPCUSER: $BITCOIN_RPC_USER NBXPLORER_BTCRPCPASSWORD: $BITCOIN_RPC_PASS + networks: + default: + ipv4_address: $APP_BTCPAY_SERVER_NBXPLORER_IP web: image: btcpayserver/btcpayserver:1.0.6.4@sha256:080ce1637b3f7ddaa63ee99799108bde535494e1aa50fdb7bac7a91fa2e21228 @@ -66,3 +69,6 @@ services: POSTGRES_HOST_AUTH_METHOD: trust volumes: - ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data + networks: + default: + ipv4_address: $APP_BTCPAY_SERVER_DB_IP diff --git a/apps/ride-the-lightning/docker-compose.yml b/apps/ride-the-lightning/docker-compose.yml index 79f97c4..8e16db9 100644 --- a/apps/ride-the-lightning/docker-compose.yml +++ b/apps/ride-the-lightning/docker-compose.yml @@ -55,3 +55,6 @@ services: - --lnd.macaroondir="/lnd/data/chain/bitcoin/$BITCOIN_NETWORK" - --lnd.tlspath="/lnd/tls.cert" - --restlisten=0.0.0.0:8081 + networks: + default: + ipv4_address: $APP_RIDE_THE_LIGHTNING_LOOP_IP diff --git a/docker-compose.yml b/docker-compose.yml index 7047765..98b766c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -206,7 +206,7 @@ networks: ipam: driver: default config: - - subnet: "${GATEWAY_IP}/16" + - subnet: "$NETWORK_IP/24" volumes: jwt-public-key: diff --git a/scripts/configure b/scripts/configure index 966086f..f3c6ecd 100755 --- a/scripts/configure +++ b/scripts/configure @@ -102,39 +102,44 @@ ENV_FILE="./templates/.env" [[ ! -z ${PREV_ENV_FILE+x} ]] && [[ -f "${PREV_ENV_FILE}" ]] && source "${PREV_ENV_FILE}" # Umbrel -GATEWAY_IP="10.0.0.1" -NGINX_IP="10.0.0.2" -DASHBOARD_IP="10.0.0.3" -MANAGER_IP="10.0.0.4" -MIDDLEWARE_IP="10.0.0.5" -NEUTRINO_SWITCHER_IP="10.0.0.6" -FRONTAIL_IP="10.0.0.7" -BITCOIN_IP="10.0.0.8" +NETWORK_IP="10.21.21.0" +GATEWAY_IP="10.21.21.1" +NGINX_IP="10.21.21.2" +DASHBOARD_IP="10.21.21.3" +MANAGER_IP="10.21.21.4" +MIDDLEWARE_IP="10.21.21.5" +NEUTRINO_SWITCHER_IP="10.21.21.6" +FRONTAIL_IP="10.21.21.7" +BITCOIN_IP="10.21.21.8" BITCOIN_RPC_PORT="8332" BITCOIN_P2P_PORT="8333" -LND_IP="10.0.0.9" +LND_IP="10.21.21.9" LND_GRPC_PORT="10009" LND_REST_PORT="8080" -ELECTRUM_IP="10.0.0.10" +ELECTRUM_IP="10.21.21.10" ELECTRUM_PORT="50001" -TOR_PROXY_IP="10.0.0.11" +TOR_PROXY_IP="10.21.21.11" TOR_PROXY_PORT="9050" # Apps -APP_BTC_RPC_EXPLORER_IP="10.0.1.0" +APP_BTC_RPC_EXPLORER_IP="10.21.21.12" +APP_BTC_RPC_EXPLORER_IP="10.21.21.12" APP_BTC_RPC_EXPLORER_PORT="3002" -APP_THUNDERHUB_IP="10.0.1.1" +APP_THUNDERHUB_IP="10.21.21.13" APP_THUNDERHUB_PORT="3000" -APP_SPHINX_RELAY_IP="10.0.1.2" +APP_SPHINX_RELAY_IP="10.21.21.14" APP_SPHINX_RELAY_PORT="3300" -APP_RIDE_THE_LIGHTNING_IP="10.0.1.3" +APP_RIDE_THE_LIGHTNING_IP="10.21.21.15" APP_RIDE_THE_LIGHTNING_PORT="3001" -APP_LIGHTNING_TERMINAL_IP="10.0.1.4" +APP_RIDE_THE_LIGHTNING_LOOP_IP="10.21.21.16" +APP_LIGHTNING_TERMINAL_IP="10.21.21.17" APP_LIGHTNING_TERMINAL_PORT="3004" -APP_SPECTER_DESKTOP_IP="10.0.1.5" +APP_SPECTER_DESKTOP_IP="10.21.21.18" APP_SPECTER_DESKTOP_PORT="25441" -APP_BTCPAY_SERVER_IP="10.0.1.6" +APP_BTCPAY_SERVER_IP="10.21.21.19" APP_BTCPAY_SERVER_PORT="3003" +APP_BTCPAY_SERVER_NBXPLORER_IP="10.21.21.20" +APP_BTCPAY_SERVER_DB_IP="10.21.21.21" # Generate RPC credentials if [[ -z ${BITCOIN_RPC_USER+x} ]] || [[ -z ${BITCOIN_RPC_PASS+x} ]] || [[ -z ${BITCOIN_RPC_AUTH+x} ]]; then @@ -238,6 +243,7 @@ fi # TODO: Update all the above code to use this simpler logic for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" "${TOR_CONF_FILE}" "${ELECTRS_CONF_FILE}" "${ENV_FILE}"; do # Umbrel + sed -i "s//${NETWORK_IP}/g" "${template}" sed -i "s//${GATEWAY_IP}/g" "${template}" sed -i "s//${NGINX_IP}/g" "${template}" sed -i "s//${DASHBOARD_IP}/g" "${template}" @@ -263,12 +269,15 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" " sed -i "s//${APP_SPHINX_RELAY_PORT}/g" "${template}" sed -i "s//${APP_RIDE_THE_LIGHTNING_IP}/g" "${template}" sed -i "s//${APP_RIDE_THE_LIGHTNING_PORT}/g" "${template}" + sed -i "s//${APP_RIDE_THE_LIGHTNING_LOOP_IP}/g" "${template}" sed -i "s//${APP_LIGHTNING_TERMINAL_IP}/g" "${template}" sed -i "s//${APP_LIGHTNING_TERMINAL_PORT}/g" "${template}" sed -i "s//${APP_SPECTER_DESKTOP_IP}/g" "${template}" sed -i "s//${APP_SPECTER_DESKTOP_PORT}/g" "${template}" sed -i "s//${APP_BTCPAY_SERVER_IP}/g" "${template}" sed -i "s//${APP_BTCPAY_SERVER_PORT}/g" "${template}" + sed -i "s//${APP_BTCPAY_SERVER_NBXPLORER_IP}/g" "${template}" + sed -i "s//${APP_BTCPAY_SERVER_DB_IP}/g" "${template}" done diff --git a/templates/.env-sample b/templates/.env-sample index 98b81ba..44abe1f 100644 --- a/templates/.env-sample +++ b/templates/.env-sample @@ -1,4 +1,5 @@ #Umbrel +NETWORK_IP= GATEWAY_IP= NGINX_IP= DASHBOARD_IP= @@ -33,10 +34,12 @@ APP_SPHINX_RELAY_IP= APP_SPHINX_RELAY_PORT= APP_RIDE_THE_LIGHTNING_IP= APP_RIDE_THE_LIGHTNING_PORT= +APP_RIDE_THE_LIGHTNING_LOOP_IP= APP_LIGHTNING_TERMINAL_IP= APP_LIGHTNING_TERMINAL_PORT= APP_SPECTER_DESKTOP_IP= APP_SPECTER_DESKTOP_PORT= APP_BTCPAY_SERVER_IP= APP_BTCPAY_SERVER_PORT= - +APP_BTCPAY_SERVER_NBXPLORER_IP= +APP_BTCPAY_SERVER_DB_IP=