diff --git a/bitcoin/docker-compose.yml b/bitcoin/docker-compose.yml index 82bb64d3..cc98b5b8 100644 --- a/bitcoin/docker-compose.yml +++ b/bitcoin/docker-compose.yml @@ -39,14 +39,4 @@ services: - "${APP_BITCOIN_RPC_PORT}:${APP_BITCOIN_RPC_PORT}" networks: default: - ipv4_address: $APP_BITCOIN_NODE_IP - - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" \ No newline at end of file + ipv4_address: $APP_BITCOIN_NODE_IP \ No newline at end of file diff --git a/bitcoin/hooks/pre-start b/bitcoin/hooks/pre-start deleted file mode 100755 index 5f4da554..00000000 --- a/bitcoin/hooks/pre-start +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Bitcoin until the RPC and P2P Tor Hidden Services are ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-rpc/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach bitcoind -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/bitcoin/torrc.template b/bitcoin/torrc.template index aedd6194..3fbccc4e 100644 --- a/bitcoin/torrc.template +++ b/bitcoin/torrc.template @@ -4,4 +4,8 @@ HiddenServicePort $APP_BITCOIN_P2P_PORT $APP_BITCOIN_NODE_IP:$APP_BITCOIN_TOR_PO # Bitcoin Core RPC Hidden Service HiddenServiceDir /data/app-$APP_ID-rpc -HiddenServicePort $APP_BITCOIN_RPC_PORT $APP_BITCOIN_NODE_IP:$APP_BITCOIN_RPC_PORT \ No newline at end of file +HiddenServicePort $APP_BITCOIN_RPC_PORT $APP_BITCOIN_NODE_IP:$APP_BITCOIN_RPC_PORT + +# Bitcoin Core Frontend Hidden Service +HiddenServiceDir /data/app-$APP_ID +HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT \ No newline at end of file diff --git a/bitcoin/umbrel-app.yml b/bitcoin/umbrel-app.yml index 7deada5e..258bd4d2 100644 --- a/bitcoin/umbrel-app.yml +++ b/bitcoin/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: bitcoin category: Finance name: Bitcoin Node diff --git a/core-lightning/docker-compose.yml b/core-lightning/docker-compose.yml index 46e0df7f..bc730038 100644 --- a/core-lightning/docker-compose.yml +++ b/core-lightning/docker-compose.yml @@ -62,14 +62,4 @@ services: - "${APP_DATA_DIR}/data/lightningd:/data/.lightning" networks: default: - ipv4_address: ${APP_CORE_LIGHTNING_DAEMON_IP} - - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" \ No newline at end of file + ipv4_address: ${APP_CORE_LIGHTNING_DAEMON_IP} \ No newline at end of file diff --git a/core-lightning/hooks/pre-start b/core-lightning/hooks/pre-start deleted file mode 100755 index f71f3b13..00000000 --- a/core-lightning/hooks/pre-start +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Core Lightning until the REST Tor Hidden Service is ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-rest/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach c-lightning-rest -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/core-lightning/torrc.template b/core-lightning/torrc.template index ed5e0dbf..a480108d 100644 --- a/core-lightning/torrc.template +++ b/core-lightning/torrc.template @@ -1,3 +1,7 @@ # Core Lightning REST Hidden Service HiddenServiceDir /data/app-$APP_ID-rest -HiddenServicePort $APP_CORE_LIGHTNING_REST_PORT $APP_CORE_LIGHTNING_REST_IP:$APP_CORE_LIGHTNING_REST_PORT \ No newline at end of file +HiddenServicePort $APP_CORE_LIGHTNING_REST_PORT $APP_CORE_LIGHTNING_REST_IP:$APP_CORE_LIGHTNING_REST_PORT + +# Core Lightning Frontend Hidden Service +HiddenServiceDir /data/app-$APP_ID +HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT \ No newline at end of file diff --git a/core-lightning/umbrel-app.yml b/core-lightning/umbrel-app.yml index a49dd0c9..6d28a705 100644 --- a/core-lightning/umbrel-app.yml +++ b/core-lightning/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: core-lightning category: Finance name: Core Lightning diff --git a/electrs/docker-compose.yml b/electrs/docker-compose.yml index dfcda40c..ebe5b497 100644 --- a/electrs/docker-compose.yml +++ b/electrs/docker-compose.yml @@ -41,14 +41,4 @@ services: - "${APP_ELECTRS_NODE_PORT}:${APP_ELECTRS_NODE_PORT}" networks: default: - ipv4_address: $APP_ELECTRS_NODE_IP - - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" \ No newline at end of file + ipv4_address: $APP_ELECTRS_NODE_IP \ No newline at end of file diff --git a/electrs/hooks/pre-start b/electrs/hooks/pre-start deleted file mode 100755 index 3c35c58d..00000000 --- a/electrs/hooks/pre-start +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Electrs until the RPC Tor Hidden Service is ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-rpc/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach electrs -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/electrs/torrc.template b/electrs/torrc.template index 3c43b4df..5caef984 100644 --- a/electrs/torrc.template +++ b/electrs/torrc.template @@ -1,3 +1,7 @@ # Electrs RPC Hidden Service HiddenServiceDir /data/app-$APP_ID-rpc -HiddenServicePort $APP_ELECTRS_NODE_PORT $APP_ELECTRS_NODE_IP:$APP_ELECTRS_NODE_PORT \ No newline at end of file +HiddenServicePort $APP_ELECTRS_NODE_PORT $APP_ELECTRS_NODE_IP:$APP_ELECTRS_NODE_PORT + +# Electrs Frontend Hidden Service +HiddenServiceDir /data/app-$APP_ID +HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT \ No newline at end of file diff --git a/electrs/umbrel-app.yml b/electrs/umbrel-app.yml index 206ea1cb..f252b57d 100644 --- a/electrs/umbrel-app.yml +++ b/electrs/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: electrs category: Finance name: Electrs diff --git a/elements/docker-compose.yml b/elements/docker-compose.yml index 7327a56a..9dcdadbc 100644 --- a/elements/docker-compose.yml +++ b/elements/docker-compose.yml @@ -59,13 +59,5 @@ services: networks: default: ipv4_address: $APP_ELEMENTS_IP + - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" \ No newline at end of file diff --git a/elements/hooks/pre-start b/elements/hooks/pre-start deleted file mode 100755 index e7bd5d23..00000000 --- a/elements/hooks/pre-start +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Elements until the RPC and P2P Tor Hidden Services are ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-p2p/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach node -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/elements/torrc.template b/elements/torrc.template index a4793584..349f58bf 100644 --- a/elements/torrc.template +++ b/elements/torrc.template @@ -4,4 +4,8 @@ HiddenServicePort $APP_ELEMENTS_NODE_RPC_PORT $APP_ELEMENTS_NODE_IP:$APP_ELEMENT # elements p2p Hidden Service HiddenServiceDir /data/app-$APP_ID-p2p -HiddenServicePort $APP_ELEMENTS_NODE_P2P_PORT $APP_ELEMENTS_NODE_IP:$APP_ELEMENTS_NODE_P2P_PORT \ No newline at end of file +HiddenServicePort $APP_ELEMENTS_NODE_P2P_PORT $APP_ELEMENTS_NODE_IP:$APP_ELEMENTS_NODE_P2P_PORT + +# elements Hidden Service +HiddenServiceDir /data/app-$APP_ID +HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT \ No newline at end of file diff --git a/elements/umbrel-app.yml b/elements/umbrel-app.yml index 30720d67..f532d9f4 100644 --- a/elements/umbrel-app.yml +++ b/elements/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: elements category: Wallet Servers name: Elements Core diff --git a/gitea/exports.sh b/gitea/exports.sh index 3f61d4cc..6791970f 100644 --- a/gitea/exports.sh +++ b/gitea/exports.sh @@ -1,5 +1,4 @@ export APP_GITEA_PORT="8085" export APP_GITEA_SSH_PORT="2222" export APP_GITEA_IP="10.21.21.39" -export APP_GITEA_DB_IP="10.21.21.40" -export APP_GITEA_TOR_HS_EXTRA_PORTS="22:${APP_GITEA_IP}:${APP_GITEA_SSH_PORT}" \ No newline at end of file +export APP_GITEA_DB_IP="10.21.21.40" \ No newline at end of file diff --git a/gitea/torrc.template b/gitea/torrc.template new file mode 100644 index 00000000..18112b6e --- /dev/null +++ b/gitea/torrc.template @@ -0,0 +1,4 @@ +# gitea Hidden Service +HiddenServiceDir /data/app-gitea +HiddenServicePort 80 $APP_GITEA_IP:$APP_GITEA_PORT +HiddenServicePort 22 $APP_GITEA_IP:$APP_GITEA_SSH_PORT \ No newline at end of file diff --git a/gitea/umbrel-app.yml b/gitea/umbrel-app.yml index 09b093f4..dfc792ed 100644 --- a/gitea/umbrel-app.yml +++ b/gitea/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: gitea category: Development name: Gitea diff --git a/jam/docker-compose.yml b/jam/docker-compose.yml index fe33eaec..f4d236bf 100644 --- a/jam/docker-compose.yml +++ b/jam/docker-compose.yml @@ -27,4 +27,4 @@ services: jm_rpc_wallet_file: jam_default networks: default: - ipv4_address: $APP_JAM_IP \ No newline at end of file + ipv4_address: $APP_JAM_IP diff --git a/jam/umbrel-app.yml b/jam/umbrel-app.yml index 72da0374..a9b0cd87 100644 --- a/jam/umbrel-app.yml +++ b/jam/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: jam category: Finance name: Jam diff --git a/kollider/exports.sh b/kollider/exports.sh index 74d35c7d..360c6c52 100644 --- a/kollider/exports.sh +++ b/kollider/exports.sh @@ -2,5 +2,4 @@ export APP_KOLLIDER_IP="10.21.21.70" export APP_KOLLIDER_PORT="4243" export APP_KOLLIDER_WS_IP="10.21.21.71" export APP_KOLLIDER_WS_PORT="4244" -export APP_KOLLIDER_HH_IP="10.21.21.72" -export APP_KOLLIDER_TOR_HS_EXTRA_PORTS="4244:${APP_KOLLIDER_WS_IP}:8080" \ No newline at end of file +export APP_KOLLIDER_HH_IP="10.21.21.72" \ No newline at end of file diff --git a/kollider/torrc.template b/kollider/torrc.template new file mode 100644 index 00000000..3e8d2bca --- /dev/null +++ b/kollider/torrc.template @@ -0,0 +1,4 @@ +# kollider Hidden Service +HiddenServiceDir /data/app-kollider +HiddenServicePort 80 $APP_KOLLIDER_IP:3000 +HiddenServicePort 4244 $APP_KOLLIDER_WS_IP:8080 \ No newline at end of file diff --git a/kollider/umbrel-app.yml b/kollider/umbrel-app.yml index f642ef24..8337a418 100644 --- a/kollider/umbrel-app.yml +++ b/kollider/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: kollider category: Finance name: Kollider diff --git a/lightning/docker-compose.yml b/lightning/docker-compose.yml index e8c8b70b..72601ab7 100644 --- a/lightning/docker-compose.yml +++ b/lightning/docker-compose.yml @@ -54,13 +54,3 @@ services: networks: default: ipv4_address: $APP_LIGHTNING_NODE_IP - - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" \ No newline at end of file diff --git a/lightning/hooks/pre-start b/lightning/hooks/pre-start deleted file mode 100755 index a9645427..00000000 --- a/lightning/hooks/pre-start +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Lightning until the GRPC and REST Tor Hidden Services are ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-grpc/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach lnd -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/lightning/torrc.template b/lightning/torrc.template index 05159727..66931f4d 100644 --- a/lightning/torrc.template +++ b/lightning/torrc.template @@ -4,4 +4,8 @@ HiddenServicePort $APP_LIGHTNING_NODE_REST_PORT $APP_LIGHTNING_NODE_IP:$APP_LIGH # LND gRPC Hidden Service HiddenServiceDir /data/app-$APP_ID-grpc -HiddenServicePort $APP_LIGHTNING_NODE_GRPC_PORT $APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT \ No newline at end of file +HiddenServicePort $APP_LIGHTNING_NODE_GRPC_PORT $APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT + +# LND Frontend Hidden Service +HiddenServiceDir /data/app-$APP_ID +HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT \ No newline at end of file diff --git a/lightning/umbrel-app.yml b/lightning/umbrel-app.yml index f1f81488..95a2a256 100644 --- a/lightning/umbrel-app.yml +++ b/lightning/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: lightning category: Finance name: Lightning Node diff --git a/samourai-server/docker-compose.yml b/samourai-server/docker-compose.yml index 42dc96ee..0675c8aa 100644 --- a/samourai-server/docker-compose.yml +++ b/samourai-server/docker-compose.yml @@ -144,13 +144,3 @@ services: networks: default: ipv4_address: $APP_SAMOURAI_SERVER_IP - - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" diff --git a/samourai-server/hooks/pre-start b/samourai-server/hooks/pre-start deleted file mode 100755 index 9ff5ad85..00000000 --- a/samourai-server/hooks/pre-start +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Samourai Server until the Dojo and Whirlpool Tor Hidden Services are ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-whirlpool/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach nginx -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach whirlpool -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/samourai-server/torrc.template b/samourai-server/torrc.template index ec10bfff..349e4aca 100644 --- a/samourai-server/torrc.template +++ b/samourai-server/torrc.template @@ -1,7 +1,11 @@ # samourai-server dojo Hidden Service -HiddenServiceDir /data/app-$APP_ID-dojo +HiddenServiceDir /data/app-samourai-server-dojo HiddenServicePort 80 $APP_SAMOURAI_SERVER_IP:80 # samourai-server whirlpool Hidden Service -HiddenServiceDir /data/app-$APP_ID-whirlpool -HiddenServicePort 80 $APP_SAMOURAI_SERVER_WHIRLPOOL_IP:$APP_SAMOURAI_SERVER_WHIRLPOOL_PORT \ No newline at end of file +HiddenServiceDir /data/app-samourai-server-whirlpool +HiddenServicePort 80 $APP_SAMOURAI_SERVER_WHIRLPOOL_IP:$APP_SAMOURAI_SERVER_WHIRLPOOL_PORT + +# samourai-server connect Hidden Service +HiddenServiceDir /data/app-samourai-server +HiddenServicePort 80 $APP_SAMOURAI_SERVER_IP:8081 \ No newline at end of file diff --git a/samourai-server/umbrel-app.yml b/samourai-server/umbrel-app.yml index 3a6f7e50..e7a2d7c7 100644 --- a/samourai-server/umbrel-app.yml +++ b/samourai-server/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: samourai-server category: Wallet Servers name: Samourai Server diff --git a/sphinx-relay/exports.sh b/sphinx-relay/exports.sh index 3842838d..fa78b8fd 100644 --- a/sphinx-relay/exports.sh +++ b/sphinx-relay/exports.sh @@ -1,3 +1,2 @@ export APP_SPHINX_RELAY_IP="10.21.21.14" -export APP_SPHINX_RELAY_PORT="3300" -export APP_SPHINX_TOR_HS_EXTRA_PORTS="${APP_SPHINX_RELAY_PORT}:${APP_SPHINX_RELAY_IP}:${APP_SPHINX_RELAY_PORT}" \ No newline at end of file +export APP_SPHINX_RELAY_PORT="3300" \ No newline at end of file diff --git a/sphinx-relay/torrc.template b/sphinx-relay/torrc.template new file mode 100644 index 00000000..55bd3a44 --- /dev/null +++ b/sphinx-relay/torrc.template @@ -0,0 +1,6 @@ +# sphinx-relay Hidden Service +# We expose 80 for the connection string UI and $APP_SPHINX_RELAY_PORT for the +# actual server connection +HiddenServiceDir /data/app-sphinx-relay +HiddenServicePort 80 $APP_SPHINX_RELAY_IP:$APP_SPHINX_RELAY_PORT +HiddenServicePort $APP_SPHINX_RELAY_PORT $APP_SPHINX_RELAY_IP:$APP_SPHINX_RELAY_PORT \ No newline at end of file diff --git a/sphinx-relay/umbrel-app.yml b/sphinx-relay/umbrel-app.yml index 68c0af1a..1278c38d 100644 --- a/sphinx-relay/umbrel-app.yml +++ b/sphinx-relay/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: sphinx-relay category: Social name: Sphinx Relay diff --git a/squeaknode/docker-compose.yml b/squeaknode/docker-compose.yml index 3a57116f..5858f8a7 100644 --- a/squeaknode/docker-compose.yml +++ b/squeaknode/docker-compose.yml @@ -31,8 +31,8 @@ services: SQUEAKNODE_LIGHTNING_LND_MACAROON_PATH: "/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon" # Tor environment variables - SQUEAKNODE_TOR_PROXY_IP: "${TOR_PROXY_IP}" - SQUEAKNODE_TOR_PROXY_PORT: "${TOR_PROXY_PORT}" + SQUEAKNODE_TOR_PROXY_IP: $TOR_PROXY_IP + SQUEAKNODE_TOR_PROXY_PORT: $TOR_PROXY_PORT # App specific environment variables SQUEAKNODE_WEBADMIN_ENABLED: "true" @@ -49,13 +49,3 @@ services: networks: default: ipv4_address: $APP_SQUEAKNODE_IP - - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" \ No newline at end of file diff --git a/squeaknode/hooks/pre-start b/squeaknode/hooks/pre-start deleted file mode 100755 index 7eade15e..00000000 --- a/squeaknode/hooks/pre-start +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Squeaknode until the P2P Tor Hidden Service is ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-p2p/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach web -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/squeaknode/torrc.template b/squeaknode/torrc.template index 7a8766a9..0c14ca45 100644 --- a/squeaknode/torrc.template +++ b/squeaknode/torrc.template @@ -1,4 +1,8 @@ # squeaknode p2p Hidden Service -HiddenServiceDir /data/app-$APP_ID-p2p +HiddenServiceDir /data/app-squeaknode-p2p HiddenServicePort $APP_SQUEAKNODE_P2P_PORT $APP_SQUEAKNODE_IP:$APP_SQUEAKNODE_P2P_PORT -HiddenServicePort $APP_SQUEAKNODE_P2P_TESTNET_PORT $APP_SQUEAKNODE_IP:$APP_SQUEAKNODE_P2P_TESTNET_PORT \ No newline at end of file +HiddenServicePort $APP_SQUEAKNODE_P2P_TESTNET_PORT $APP_SQUEAKNODE_IP:$APP_SQUEAKNODE_P2P_TESTNET_PORT + +# squeaknode Hidden Service +HiddenServiceDir /data/app-squeaknode +HiddenServicePort 80 $APP_SQUEAKNODE_IP:$APP_SQUEAKNODE_PORT \ No newline at end of file diff --git a/squeaknode/umbrel-app.yml b/squeaknode/umbrel-app.yml index 6e0ec7ad..36ac7eca 100644 --- a/squeaknode/umbrel-app.yml +++ b/squeaknode/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: squeaknode category: Social name: Squeaknode diff --git a/suredbits-wallet/docker-compose.yml b/suredbits-wallet/docker-compose.yml index 8059f62f..e0b6fe9a 100644 --- a/suredbits-wallet/docker-compose.yml +++ b/suredbits-wallet/docker-compose.yml @@ -58,13 +58,3 @@ services: networks: default: ipv4_address: $APP_SUREDBITS_WALLET_SERVER_IP - - tor: - image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a - user: "1000:1000" - restart: on-failure - volumes: - - ${APP_DATA_DIR}/torrc:/etc/tor/torrc:ro - - ${TOR_DATA_DIR}:/data - environment: - HOME: "/tmp" \ No newline at end of file diff --git a/suredbits-wallet/hooks/pre-start b/suredbits-wallet/hooks/pre-start deleted file mode 100755 index 931733ac..00000000 --- a/suredbits-wallet/hooks/pre-start +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Delay booting Suredbits Wallet until the P2P Tor Hidden Service is ready - -HIDDEN_SERVICE_FILE="${TOR_DATA_DIR}/app-${APP_ID}-p2p/hostname" - -if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - exit -fi - -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach walletserver -"${UMBREL_ROOT}/scripts/app" compose "${APP_ID}" up --detach tor - -echo "App: ${APP_ID} - Generating Tor Hidden Service..." - -for attempt in $(seq 1 100); do - if [[ -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file created successfully!" - break - fi - sleep 0.1 -done - -if [[ ! -f "${HIDDEN_SERVICE_FILE}" ]]; then - echo "App: ${APP_ID} - Hidden service file wasn't created" -fi \ No newline at end of file diff --git a/suredbits-wallet/torrc.template b/suredbits-wallet/torrc.template index 64000a0f..b1dbb9de 100644 --- a/suredbits-wallet/torrc.template +++ b/suredbits-wallet/torrc.template @@ -1,3 +1,7 @@ # suredbits-wallet p2p Hidden Service -HiddenServiceDir /data/app-$APP_ID-p2p -HiddenServicePort $APP_SUREDBITS_WALLET_P2P_PORT $APP_SUREDBITS_WALLET_SERVER_IP:$APP_SUREDBITS_WALLET_P2P_PORT \ No newline at end of file +HiddenServiceDir /data/app-suredbits-wallet-p2p +HiddenServicePort $APP_SUREDBITS_WALLET_P2P_PORT $APP_SUREDBITS_WALLET_SERVER_IP:$APP_SUREDBITS_WALLET_P2P_PORT + +# suredbits-wallet Hidden Service +HiddenServiceDir /data/app-suredbits-wallet +HiddenServicePort 80 $APP_SUREDBITS_WALLET_IP:3002 \ No newline at end of file diff --git a/suredbits-wallet/umbrel-app.yml b/suredbits-wallet/umbrel-app.yml index 6a474ff0..fbc3ce37 100644 --- a/suredbits-wallet/umbrel-app.yml +++ b/suredbits-wallet/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: suredbits-wallet category: Finance name: Suredbits Wallet diff --git a/synapse/exports.sh b/synapse/exports.sh index 4c5653b3..f060591c 100644 --- a/synapse/exports.sh +++ b/synapse/exports.sh @@ -1,3 +1,2 @@ export APP_SYNAPSE_IP="10.21.21.44" -export APP_SYNAPSE_PORT="8008" -export APP_SYNAPSE_TOR_HS_EXTRA_PORTS="${APP_SYNAPSE_PORT}:${APP_SYNAPSE_IP}:${APP_SYNAPSE_PORT}" \ No newline at end of file +export APP_SYNAPSE_PORT="8008" \ No newline at end of file diff --git a/synapse/torrc.template b/synapse/torrc.template new file mode 100644 index 00000000..80d6c1ca --- /dev/null +++ b/synapse/torrc.template @@ -0,0 +1,4 @@ +# synapse Hidden Service +HiddenServiceDir /data/app-synapse +HiddenServicePort 80 $APP_SYNAPSE_IP:$APP_SYNAPSE_PORT +HiddenServicePort $APP_SYNAPSE_PORT $APP_SYNAPSE_IP:$APP_SYNAPSE_PORT \ No newline at end of file diff --git a/synapse/umbrel-app.yml b/synapse/umbrel-app.yml index dcea422c..d13d007f 100644 --- a/synapse/umbrel-app.yml +++ b/synapse/umbrel-app.yml @@ -1,4 +1,4 @@ -manifestVersion: 1.1 +manifestVersion: 1 id: synapse category: Social name: Synapse