Revert "Revert "Add internal Tor daemon to required apps (getumbrel#218…

…)" (getumbrel#219)" This reverts commit dc98eff.
standardsats · Oct 25, 2022 · ca9361b · ca9361b
1 parent dc98eff
commit ca9361b
Show file tree

Hide file tree

Showing 46 changed files with 327 additions and 86 deletions.
diff --git a/bitcoin/docker-compose.yml b/bitcoin/docker-compose.yml
@@ -39,4 +39,14 @@ services:
       - "${APP_BITCOIN_RPC_PORT}:${APP_BITCOIN_RPC_PORT}"
     networks:
       default:
-        ipv4_address: $APP_BITCOIN_NODE_IP
+        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"
diff --git a/bitcoin/hooks/pre-start b/bitcoin/hooks/pre-start
@@ -0,0 +1,26 @@
+#!/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
diff --git a/bitcoin/torrc.template b/bitcoin/torrc.template
@@ -4,8 +4,4 @@ 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
-
-# Bitcoin Core Frontend Hidden Service
-HiddenServiceDir /data/app-$APP_ID
-HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT
+HiddenServicePort $APP_BITCOIN_RPC_PORT $APP_BITCOIN_NODE_IP:$APP_BITCOIN_RPC_PORT
diff --git a/bitcoin/umbrel-app.yml b/bitcoin/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: bitcoin
 category: Finance
 name: Bitcoin Node

diff --git a/core-lightning/docker-compose.yml b/core-lightning/docker-compose.yml
@@ -62,4 +62,14 @@ services:
       - "${APP_DATA_DIR}/data/lightningd:/data/.lightning"
     networks:
       default:
-        ipv4_address: ${APP_CORE_LIGHTNING_DAEMON_IP}
+        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"
diff --git a/core-lightning/hooks/pre-start b/core-lightning/hooks/pre-start
@@ -0,0 +1,26 @@
+#!/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
diff --git a/core-lightning/torrc.template b/core-lightning/torrc.template
@@ -1,7 +1,3 @@
 # 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
-
-# Core Lightning Frontend Hidden Service
-HiddenServiceDir /data/app-$APP_ID
-HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT
+HiddenServicePort $APP_CORE_LIGHTNING_REST_PORT $APP_CORE_LIGHTNING_REST_IP:$APP_CORE_LIGHTNING_REST_PORT
diff --git a/core-lightning/umbrel-app.yml b/core-lightning/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: core-lightning
 category: Finance
 name: Core Lightning

diff --git a/electrs/docker-compose.yml b/electrs/docker-compose.yml
@@ -41,4 +41,14 @@ services:
       - "${APP_ELECTRS_NODE_PORT}:${APP_ELECTRS_NODE_PORT}"
     networks:
       default:
-        ipv4_address: $APP_ELECTRS_NODE_IP
+        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"
diff --git a/electrs/hooks/pre-start b/electrs/hooks/pre-start
@@ -0,0 +1,26 @@
+#!/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
diff --git a/electrs/torrc.template b/electrs/torrc.template
@@ -1,7 +1,3 @@
 # Electrs RPC Hidden Service
 HiddenServiceDir /data/app-$APP_ID-rpc
-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
+HiddenServicePort $APP_ELECTRS_NODE_PORT $APP_ELECTRS_NODE_IP:$APP_ELECTRS_NODE_PORT
diff --git a/electrs/umbrel-app.yml b/electrs/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: electrs
 category: Finance
 name: Electrs

diff --git a/elements/docker-compose.yml b/elements/docker-compose.yml
@@ -59,5 +59,13 @@ 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"
diff --git a/elements/hooks/pre-start b/elements/hooks/pre-start
@@ -0,0 +1,26 @@
+#!/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
diff --git a/elements/torrc.template b/elements/torrc.template
@@ -4,8 +4,4 @@ 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
-
-# elements Hidden Service
-HiddenServiceDir /data/app-$APP_ID
-HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT
+HiddenServicePort $APP_ELEMENTS_NODE_P2P_PORT $APP_ELEMENTS_NODE_IP:$APP_ELEMENTS_NODE_P2P_PORT
diff --git a/elements/umbrel-app.yml b/elements/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: elements
 category: Wallet Servers
 name: Elements Core

diff --git a/gitea/exports.sh b/gitea/exports.sh
@@ -1,4 +1,5 @@
 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_DB_IP="10.21.21.40"
+export APP_GITEA_TOR_HS_EXTRA_PORTS="22:${APP_GITEA_IP}:${APP_GITEA_SSH_PORT}"
diff --git a/gitea/torrc.template b/gitea/torrc.template
diff --git a/gitea/umbrel-app.yml b/gitea/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: gitea
 category: Development
 name: Gitea

diff --git 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
+        ipv4_address: $APP_JAM_IP
diff --git a/jam/umbrel-app.yml b/jam/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: jam
 category: Finance
 name: Jam

diff --git a/kollider/exports.sh b/kollider/exports.sh
@@ -2,4 +2,5 @@ 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_HH_IP="10.21.21.72"
+export APP_KOLLIDER_TOR_HS_EXTRA_PORTS="4244:${APP_KOLLIDER_WS_IP}:8080"
diff --git a/kollider/torrc.template b/kollider/torrc.template
diff --git a/kollider/umbrel-app.yml b/kollider/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: kollider
 category: Finance
 name: Kollider

diff --git a/lightning/docker-compose.yml b/lightning/docker-compose.yml
@@ -54,3 +54,13 @@ 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"
diff --git a/lightning/hooks/pre-start b/lightning/hooks/pre-start
@@ -0,0 +1,26 @@
+#!/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
diff --git a/lightning/torrc.template b/lightning/torrc.template
@@ -4,8 +4,4 @@ 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
-
-# LND Frontend Hidden Service
-HiddenServiceDir /data/app-$APP_ID
-HiddenServicePort 80 $APP_PROXY_HOSTNAME:$APP_PROXY_PORT
+HiddenServicePort $APP_LIGHTNING_NODE_GRPC_PORT $APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT
diff --git a/lightning/umbrel-app.yml b/lightning/umbrel-app.yml
@@ -1,4 +1,4 @@
-manifestVersion: 1
+manifestVersion: 1.1
 id: lightning
 category: Finance
 name: Lightning Node

diff --git a/samourai-server/docker-compose.yml b/samourai-server/docker-compose.yml
@@ -144,3 +144,13 @@ 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"