Add support for app proxy for all apps

3 years ago · fea04b09ba
131 changed files with 275 additions and 242 deletions
--- a/agora/docker-compose.yml
+++ b/agora/docker-compose.yml
@ -1,6 +1,11 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_AGORA_IP
+      APP_PORT: 80
+
  filebrowser:
    image: filebrowser/filebrowser:v2.21.1@sha256:e1f43b1b8a1acb1d7cd5f934454e7a2ef571ea3bab48b0e1ed0fa97ef9df8d69
    user: 1000:1000
@ -50,8 +55,6 @@ services:
      NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx/
      APP_AGORA_SERVER_IP: $APP_AGORA_SERVER_IP
      APP_AGORA_FILEBROWSER_IP: $APP_AGORA_FILEBROWSER_IP
-    ports:
-      - "$APP_AGORA_PORT:80"
    depends_on:
      - agora
      - filebrowser
--- a/agora/torrc.template
+++ b/agora/torrc.template
@ -1,3 +0,0 @@
-# agora Hidden Service
-HiddenServiceDir /data/app-agora
-HiddenServicePort 80 $APP_AGORA_IP:80
--- a/agora/umbrel-app.yml
+++ b/agora/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: agora
 category: Files
 name: Agora
--- a/bitfeed/docker-compose.yml
+++ b/bitfeed/docker-compose.yml
@ -1,6 +1,11 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_BITFEED_IP
+      APP_PORT: 80
+
  web:
    image: ghcr.io/bitfeed-project/bitfeed-client:v2.2.1@sha256:70c89d49d20ba3da21c648c259f45a4b89e06bfe1d97374a092dce6f891d03c6
    restart: on-failure
@ -11,8 +16,6 @@ services:
      TARGET: "umbrel"
      BACKEND_HOST: "$APP_BITFEED_API_IP"
      BACKEND_PORT: "$APP_BITFEED_API_PORT"
-    ports:
-      - "$APP_BITFEED_PORT:80"
    networks:
      default:
        ipv4_address: $APP_BITFEED_IP
--- a/bitfeed/torrc.template
+++ b/bitfeed/torrc.template
@ -1,3 +0,0 @@
-# bitfeed Hidden Service
-HiddenServiceDir /data/app-bitfeed
-HiddenServicePort 80 $APP_BITFEED_IP:80
--- a/bitfeed/umbrel-app.yml
+++ b/bitfeed/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: bitfeed
 category: Explorers
 name: Bitfeed
--- a/bleskomat-server/docker-compose.yml
+++ b/bleskomat-server/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_BLESKOMAT_SERVER_IP
+      APP_PORT: $APP_BLESKOMAT_SERVER_PORT

  db:
    image: postgres:10.20-stretch@sha256:130e08bb19199bd055e585e8938c5ebb0555dc13b445fad5b0bd727e4b75149c
@ -24,8 +28,6 @@ services:
    stop_grace_period: 1m
    depends_on:
      - db
-    ports:
-      - "$APP_BLESKOMAT_SERVER_PORT:$APP_BLESKOMAT_SERVER_PORT"
    volumes:
      - $APP_DATA_DIR/data/web:/usr/src/app/data
      - $LND_DATA_DIR:/lnd:ro
--- a/bleskomat-server/torrc.template
+++ b/bleskomat-server/torrc.template
@ -1,3 +0,0 @@
-# bleskomat-server Hidden Service
-HiddenServiceDir /data/app-bleskomat-server
-HiddenServicePort 80 $APP_BLESKOMAT_SERVER_IP:$APP_BLESKOMAT_SERVER_PORT
--- a/bleskomat-server/umbrel-app.yml
+++ b/bleskomat-server/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: bleskomat-server
 category: Wallet Servers
 name: Bleskomat Server
--- a/bluewallet/docker-compose.yml
+++ b/bluewallet/docker-compose.yml
@ -1,6 +1,11 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_BLUEWALLET_LNDHUB_IP
+      APP_PORT: $APP_BLUEWALLET_LNDHUB_PORT
+
  redis:
    image: "redis:6.2.2-buster@sha256:e10f55f92478715698a2cef97c2bbdc48df2a05081edd884938903aa60df6396"
    user: "1000:1000"
@ -21,8 +26,6 @@ services:
    restart: "on-failure"
    stop_grace_period: "1m"
    init: true
-    ports:
-      - "${APP_BLUEWALLET_LNDHUB_PORT}:${APP_BLUEWALLET_LNDHUB_PORT}"
    volumes:
      - "${LND_DATA_DIR}:/lnd:ro"
    environment:
--- a/bluewallet/torrc.template
+++ b/bluewallet/torrc.template
@ -1,2 +0,0 @@
-HiddenServiceDir /data/app-bluewallet
-HiddenServicePort 80 $APP_BLUEWALLET_LNDHUB_IP:$APP_BLUEWALLET_LNDHUB_PORT
--- a/bluewallet/umbrel-app.yml
+++ b/bluewallet/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: bluewallet
 category: Wallet Servers
 name: BlueWallet Lightning
--- a/btc-rpc-explorer/docker-compose.yml
+++ b/btc-rpc-explorer/docker-compose.yml
@ -1,12 +1,15 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_BTC_RPC_EXPLORER_IP
+      APP_PORT: $APP_BTC_RPC_EXPLORER_PORT
+
  web:
    image: getumbrel/btc-rpc-explorer:v3.3.0@sha256:cfd14f8e722cfbf1ad106ba224569c8babe685422461a641abc210e13913c636
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "$APP_BTC_RPC_EXPLORER_PORT:$APP_BTC_RPC_EXPLORER_PORT"
    environment:
      # Docker requirements
      BTCEXP_HOST: 0.0.0.0
--- a/btc-rpc-explorer/torrc.template
+++ b/btc-rpc-explorer/torrc.template
@ -1,3 +0,0 @@
-# btc-rpc-explorer Hidden Service
-HiddenServiceDir /data/app-btc-rpc-explorer
-HiddenServicePort 80 $APP_BTC_RPC_EXPLORER_IP:$APP_BTC_RPC_EXPLORER_PORT
--- a/btc-rpc-explorer/umbrel-app.yml
+++ b/btc-rpc-explorer/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: btc-rpc-explorer
 category: Explorers
 name: BTC RPC Explorer
--- a/btcpay-server/docker-compose.yml
+++ b/btcpay-server/docker-compose.yml
@ -1,6 +1,11 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_BTCPAY_SERVER_IP
+      APP_PORT: $APP_BTCPAY_SERVER_PORT
+
  nbxplorer:
    image: nicolasdorier/nbxplorer:2.2.20@sha256:8f0e7f68513596e0a2555990d262169088a70204abe397bf18ba921f9b0608f3
    user: "1000:1000"
@ -30,8 +35,6 @@ services:
    stop_grace_period: 1m
    depends_on: [ nbxplorer, postgres ]
    entrypoint: [ "dotnet", "BTCPayServer.dll" ]
-    ports:
-        - "$APP_BTCPAY_SERVER_PORT:$APP_BTCPAY_SERVER_PORT"
    volumes:
        - ${APP_DATA_DIR}/data/btcpay:/data
        - ${APP_DATA_DIR}/data/nbxplorer:/data/.nbxplorer
--- a/btcpay-server/torrc.template
+++ b/btcpay-server/torrc.template
@ -1,3 +0,0 @@
-# btcpay-server Hidden Service
-HiddenServiceDir /data/app-btcpay-server
-HiddenServicePort 80 $APP_BTCPAY_SERVER_IP:$APP_BTCPAY_SERVER_PORT
--- a/btcpay-server/umbrel-app.yml
+++ b/btcpay-server/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: btcpay-server
 category: Finance
 name: BTCPay Server
--- a/code-server/docker-compose.yml
+++ b/code-server/docker-compose.yml
@ -1,12 +1,15 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_CODE_SERVER_IP
+      APP_PORT: 8080
+
  server:
    image: codercom/code-server:3.11.1@sha256:9bb2444f9d0c26765924e29155ac4a8febecb1e080f12c4e368e71dbe6a675b5
    restart: on-failure
    user: "1000:1000"
-    ports:
-      - "${APP_CODE_SERVER_PORT}:8080"
    volumes:
      - ${APP_DATA_DIR}/data:/home/coder
    environment:
--- a/code-server/torrc.template
+++ b/code-server/torrc.template
@ -1,3 +0,0 @@
-# code-server Hidden Service
-HiddenServiceDir /data/app-code-server
-HiddenServicePort 80 $APP_CODE_SERVER_IP:8080
--- a/code-server/umbrel-app.yml
+++ b/code-server/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: code-server
 category: Development
 name: code-server
--- a/electrumx/docker-compose.yml
+++ b/electrumx/docker-compose.yml
@ -1,14 +1,17 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_ELECTRUMX_IP
+      APP_PORT: 50001
+
  server:
    image: lukechilds/electrumx:v1.16.0@sha256:2949784536f8f85af229004e12e5b5c3a1d7428918a492f77b4e958035c2ae2a
    user: "1000:1000"
    init: true
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "${APP_ELECTRUMX_PORT}:50001"
    volumes:
      - ${APP_DATA_DIR}/data:/data
    environment:
--- a/element/docker-compose.yml
+++ b/element/docker-compose.yml
@ -1,14 +1,17 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_ELEMENT_IP
+      APP_PORT: 80
+
  web:
    image: getumbrel/element-web:v1.8.4@sha256:16b2776278a8a9d8a2397ccd75484f8728fd3223cb3329bf572b50b8f950636c
    # NGINX parent container requires root
    # user: "1000:1000"
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "$APP_ELEMENT_PORT:80"
    networks:
      default:
        ipv4_address: $APP_ELEMENT_IP
--- a/element/torrc.template
+++ b/element/torrc.template
@ -1,3 +0,0 @@
-# element Hidden Service
-HiddenServiceDir /data/app-element
-HiddenServicePort 80 $APP_ELEMENT_IP:80
--- a/element/umbrel-app.yml
+++ b/element/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: element
 category: Social
 name: Element
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@ -1,12 +1,16 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_GITEA_IP
+      APP_PORT: $APP_GITEA_PORT
+
  server:
    image: gitea/gitea:1.15.2-rootless@sha256:6caabcf0e1a21a2d885f44c8f19693ce44ec3d443e2116f86a2937db453566a8
    user: "1000:1000"
    restart: on-failure
    ports:
-      - "${APP_GITEA_PORT}:${APP_GITEA_PORT}"
      - "${APP_GITEA_SSH_PORT}:${APP_GITEA_SSH_PORT}"
    volumes:
      - ${APP_DATA_DIR}/data/gitea/data:/var/lib/gitea
@ -27,6 +31,7 @@ services:
    networks:
      default:
        ipv4_address: $APP_GITEA_IP
+
  db:
    image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd
    user: "1000:1000"
--- a/gitea/umbrel-app.yml
+++ b/gitea/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: gitea
 category: Development
 name: Gitea
--- a/helipad/docker-compose.yml
+++ b/helipad/docker-compose.yml
@ -1,14 +1,17 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_HELIPAD_IP
+      APP_PORT: 2112
+
  web:
    image: podcastindexorg/podcasting20-helipad:v0.1.9@sha256:9706dc5a337dd087b188b32685a342d5d69d154b3e0449e4623c4a4e3988dd22
    init: true
    restart: on-failure
    stop_grace_period: 1m
    user: "1000:1000"
-    ports:
-      - ${APP_HELIPAD_PORT}:2112
    volumes:
      - ${APP_DATA_DIR}/data:/data
      - ${LND_DATA_DIR}:/lnd:ro
--- a/helipad/torrc.template
+++ b/helipad/torrc.template
@ -1,3 +0,0 @@
-# helipad Hidden Service
-HiddenServiceDir /data/app-helipad
-HiddenServicePort 80 $APP_HELIPAD_IP:2112
--- a/helipad/umbrel-app.yml
+++ b/helipad/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: helipad
 category: Lightning Node Management
 name: Helipad
--- a/home-assistant/docker-compose.yml
+++ b/home-assistant/docker-compose.yml
@ -1,10 +1,13 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_HOME_ASSISTANT_IP
+      APP_PORT: 8123
+
  server:
    image: homeassistant/home-assistant:2021.12.0@sha256:116f78d5cf48c4b1adcb3eb665885cb0d14dc0156e9291015ca6fbce13540ff5
-    ports:
-      - "${APP_HOME_ASSISTANT_PORT}:8123"
    volumes:
      - ${APP_DATA_DIR}/data:/config
    networks:
--- a/home-assistant/torrc.template
+++ b/home-assistant/torrc.template
@ -1,3 +0,0 @@
-# home-assistant Hidden Service
-HiddenServiceDir /data/app-home-assistant
-HiddenServicePort 80 $APP_HOME_ASSISTANT_IP:8123
--- a/home-assistant/umbrel-app.yml
+++ b/home-assistant/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: home-assistant
 category: Automation
 name: Home Assistant
--- a/itchysats/docker-compose.yml
+++ b/itchysats/docker-compose.yml
@ -1,12 +1,15 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_ITCHYSATS_IP
+      APP_PORT: 8000
+
  web:
    image: ghcr.io/itchysats/itchysats/taker:0.4.10@sha256:6ce4691fa1d940a59598e1271f5c808869acfe8e6d639bead28076b5f7172414
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - ${APP_ITCHYSATS_PORT}:8000
    volumes:
      - ${APP_DATA_DIR}/data:/data
    command:
--- a/itchysats/torrc.template
+++ b/itchysats/torrc.template
@ -1,3 +0,0 @@
-# itchysats Hidden Service
-HiddenServiceDir /data/app-itchysats
-HiddenServicePort 80 $APP_ITCHYSATS_IP:8000
--- a/itchysats/umbrel-app.yml
+++ b/itchysats/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: itchysats
 category: Finance
 name: ItchySats
--- a/jam/docker-compose.yml
+++ b/jam/docker-compose.yml
@ -1,13 +1,16 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_JAM_IP
+      APP_PORT: 80
+
  jam:
    image: ghcr.io/joinmarket-webui/joinmarket-webui-standalone:v0.0.5-clientserver-v0.9.5@sha256:5fbbc766b25449e87f5fffb689d236b0a0c9b6332c1cb75478bcbc7225d04ad9
    restart: on-failure
    stop_grace_period: 1m
    init: true
-    ports:
-      - "$APP_JAM_PORT:80"
    volumes:
      - ${APP_DATA_DIR}/data/joinmarket:/root/.joinmarket
    environment:
--- a/jam/torrc.template
+++ b/jam/torrc.template
@ -1,3 +0,0 @@
-# jam Hidden Service
-HiddenServiceDir /data/app-jam
-HiddenServicePort 80 $APP_JAM_IP:80
--- a/jam/umbrel-app.yml
+++ b/jam/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: jam
 category: Wallets
 name: Jam
--- a/kollider/docker-compose.yml
+++ b/kollider/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_KOLLIDER_IP
+      APP_PORT: 3000
  backend:
    image: kolliderhq/kollider-lite-backend:v1.0.3@sha256:1229b8d800447ddd43b8e21e5dbbdc4773e873d3bc4f13a00976bc14607c393b
    init: true
@ -41,8 +45,6 @@ services:
    stop_grace_period: 1m
    volumes:
      - ${APP_DATA_DIR}/data/cache/images:/app/.next/cache/images
-    ports:
-      - "$APP_KOLLIDER_PORT:3000"
    networks:
      default:
        ipv4_address: $APP_KOLLIDER_IP
--- a/kollider/umbrel-app.yml
+++ b/kollider/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: kollider
 category: Finance
 name: Kollider
--- a/krystal-bull/docker-compose.yml
+++ b/krystal-bull/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_KRYSTAL_BULL_IP
+      APP_PORT: 3001
  web:
    image: bitcoinscala/oracle-server-ui:1.9.0-c946d255-SNAPSHOT@sha256:8524db49036e35ce0da2dca515d54ed997328c3ca339d81e7782d4764c195995
    user: "1000:1000"
@ -16,8 +20,6 @@ services:
      TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT}
      DEFAULT_UI_PASSWORD: $APP_PASSWORD
      BITCOIN_S_ORACLE_RPC_PASSWORD: $APP_PASSWORD
-    ports:
-      - "${APP_KRYSTAL_BULL_PORT}:3001"
    networks:
      default:
        ipv4_address: $APP_KRYSTAL_BULL_IP
--- a/krystal-bull/torrc.template
+++ b/krystal-bull/torrc.template
@ -1,3 +0,0 @@
-# krystal-bull Hidden Service
-HiddenServiceDir /data/app-krystal-bull
-HiddenServicePort 80 $APP_KRYSTAL_BULL_IP:3001
--- a/krystal-bull/umbrel-app.yml
+++ b/krystal-bull/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: krystal-bull
 category: Finance
 name: Krystal Bull
--- a/lightning-shell/docker-compose.yml
+++ b/lightning-shell/docker-compose.yml
@ -1,12 +1,14 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_LIGHTNING_SHELL_IP
+      APP_PORT: 7681
  web:
    image: ghcr.io/ibz/lightning-shell:v0.1.10-buster-slim@sha256:4ea6aafee8ddd092b27850bccef71458d9e382e63d12b159d075bfde328ebef3
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - ${APP_LIGHTNING_SHELL_PORT}:7681
    volumes:
      - ${LND_DATA_DIR}:/lnd:ro
      - ${APP_DATA_DIR}/data:/data
--- a/lightning-shell/torrc.template
+++ b/lightning-shell/torrc.template
@ -1,3 +0,0 @@
-# lightning-shell Hidden Service
-HiddenServiceDir /data/app-lightning-shell
-HiddenServicePort 80 $APP_LIGHTNING_SHELL_IP:7681
--- a/lightning-shell/umbrel-app.yml
+++ b/lightning-shell/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: lightning-shell
 category: Lightning Node Management
 name: Lightning Shell
--- a/lightning-terminal/docker-compose.yml
+++ b/lightning-terminal/docker-compose.yml
@ -1,13 +1,16 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_LIGHTNING_TERMINAL_IP
+      APP_PORT: $APP_LIGHTNING_TERMINAL_PORT
+
  web:
    image: lightninglabs/lightning-terminal:v0.6.5-alpha@sha256:541fb9034a25dd4336becabdee6d40f76c3f4ae4557cbce30a46a3a8e3ef0e74
    user: "1000:1000"
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "$APP_LIGHTNING_TERMINAL_PORT:$APP_LIGHTNING_TERMINAL_PORT"
    volumes:
      - ${APP_DATA_DIR}/data:/data
      - ${LND_DATA_DIR}:/lnd:ro
--- a/lightning-terminal/torrc.template
+++ b/lightning-terminal/torrc.template
@ -1,3 +0,0 @@
-# lightning-terminal Hidden Service
-HiddenServiceDir /data/app-lightning-terminal
-HiddenServicePort 80 $APP_LIGHTNING_TERMINAL_IP:$APP_LIGHTNING_TERMINAL_PORT
--- a/lightning-terminal/umbrel-app.yml
+++ b/lightning-terminal/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: lightning-terminal
 category: Lightning Node Management
 name: Lightning Terminal
--- a/lnbits/docker-compose.yml
+++ b/lnbits/docker-compose.yml
@ -1,14 +1,16 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_LNBITS_IP
+      APP_PORT: $APP_LNBITS_PORT
  web:
    image: lnbitsdocker/lnbits-legend:0.8.0@sha256:3426e326bac347d09b4e018780cb1ecd8e5eac35851383d476076769ab4a9b2e
    user: 1000:1000
    init: true
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "$APP_LNBITS_PORT:$APP_LNBITS_PORT"
    volumes:
      - ${APP_DATA_DIR}/data:/data
      - ${LND_DATA_DIR}:/lnd:ro
--- a/lnbits/torrc.template
+++ b/lnbits/torrc.template
@ -1,3 +0,0 @@
-# lnbits Hidden Service
-HiddenServiceDir /data/app-lnbits
-HiddenServicePort 80 $APP_LNBITS_IP:$APP_LNBITS_PORT
--- a/lnbits/umbrel-app.yml
+++ b/lnbits/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: lnbits
 category: Finance
 name: LNbits
--- a/lndg/docker-compose.yml
+++ b/lndg/docker-compose.yml
@ -1,12 +1,15 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_LNDG_IP
+      APP_PORT: $APP_LNDG_PORT
+
  web:
    image: ghcr.io/cryptosharks131/lndg:v1.0.5@sha256:cebb3cb42ebc26e7d148792e9f191dea78016cd514940a19143d3e51b5e023d2
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "${APP_LNDG_PORT}:${APP_LNDG_PORT}"
    volumes:
      - ${LND_DATA_DIR}:/root/.lnd:ro
      - ${APP_DATA_DIR}:/lndg/data
--- a/lndg/torrc.template
+++ b/lndg/torrc.template
@ -1,3 +0,0 @@
-# lndg Hidden Service
-HiddenServiceDir /data/app-lndg
-HiddenServicePort 80 $APP_LNDG_IP:$APP_LNDG_PORT
--- a/lndg/umbrel-app.yml
+++ b/lndg/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: lndg
 category: Lightning Node Management
 name: LNDg
--- a/lnmarkets/docker-compose.yml
+++ b/lnmarkets/docker-compose.yml
@ -1,14 +1,16 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_LNMARKETS_IP
+      APP_PORT: $APP_LNMARKETS_PORT
  lnmarkets:
    image: ghcr.io/ln-markets/umbrel:v1.1.5@sha256:94b2259e4c2445d518cabc4bd6c0519c5fae87a3fb3c0bb564522e805d63bd89
    init: true
    user: 1000:1000
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "$APP_LNMARKETS_PORT:$APP_LNMARKETS_PORT"
    volumes:
      - ${LND_DATA_DIR}:/lnd:ro
    environment:
--- a/lnmarkets/torrc.template
+++ b/lnmarkets/torrc.template
@ -1,3 +0,0 @@
-# lnmarkets Hidden Service
-HiddenServiceDir /data/app-lnmarkets
-HiddenServicePort 80 $APP_LNMARKETS_IP:$APP_LNMARKETS_PORT
--- a/lnmarkets/umbrel-app.yml
+++ b/lnmarkets/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: lnmarkets
 category: Finance
 name: LN Markets
--- a/mempool/docker-compose.yml
+++ b/mempool/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_MEMPOOL_IP
+      APP_PORT: $APP_MEMPOOL_PORT
  web:
    image: mempool/frontend:v2.3.1@sha256:38c955caeb58014b266904b059bfabbdab8321d20b11e7cccb139be6dfc8e36e
    user: "1000:1000"
@ -8,8 +12,6 @@ services:
    restart: on-failure
    stop_grace_period: 1m
    command: "./wait-for mariadb:3306 --timeout=720 -- nginx -g 'daemon off;'"
-    ports:
-      - ${APP_MEMPOOL_PORT}:${APP_MEMPOOL_PORT}
    environment:
      FRONTEND_HTTP_PORT: $APP_MEMPOOL_PORT
      BACKEND_MAINNET_HTTP_HOST: $APP_MEMPOOL_API_IP
--- a/mempool/torrc.template
+++ b/mempool/torrc.template
@ -1,3 +0,0 @@
-# mempool Hidden Service
-HiddenServiceDir /data/app-mempool
-HiddenServicePort 80 $APP_MEMPOOL_IP:$APP_MEMPOOL_PORT
--- a/mempool/umbrel-app.yml
+++ b/mempool/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: mempool
 category: Explorers
 name: mempool
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_NEXTCLOUD_IP
+      APP_PORT: 80
  db:
    image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd
    user: "1000:1000"
@ -33,8 +37,6 @@ services:
    # https://github.com/nextcloud/docker/blob/05026b029d37fc5cd488d4a4a2a79480e39841ba/21.0/apache/entrypoint.sh#L53-L77
    # user: "1000:1000"
    restart: on-failure
-    ports:
-      - ${APP_NEXTCLOUD_PORT}:80
    volumes:
      - ${APP_DATA_DIR}/data/nextcloud:/var/www/html
    environment:
--- a/nextcloud/torrc.template
+++ b/nextcloud/torrc.template
@ -1,3 +0,0 @@
-# nextcloud Hidden Service
-HiddenServiceDir /data/app-nextcloud
-HiddenServicePort 80 $APP_NEXTCLOUD_IP:80
--- a/nextcloud/umbrel-app.yml
+++ b/nextcloud/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: nextcloud
 category: Files
 name: Nextcloud
--- a/node-red/docker-compose.yml
+++ b/node-red/docker-compose.yml
@ -1,12 +1,14 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_NODE_RED_IP
+      APP_PORT: $APP_NODE_RED_PORT
  web:
    image: nodered/node-red:2.0.6-12@sha256:c15bfeef73c2b348c0fb5f70d3b3013575a6ebf2af942a1d8196c7d7d842f6bb
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "${APP_NODE_RED_PORT}:${APP_NODE_RED_PORT}"
    volumes:
      - ${APP_DATA_DIR}/data:/data
      - ${LND_DATA_DIR}:/lnd:ro
--- a/node-red/torrc.template
+++ b/node-red/torrc.template
@ -1,3 +0,0 @@
-# node-red Hidden Service
-HiddenServiceDir /data/app-node-red
-HiddenServicePort 80 $APP_NODE_RED_IP:$APP_NODE_RED_PORT
--- a/node-red/umbrel-app.yml
+++ b/node-red/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: node-red
 category: Automation
 name: Node-RED
--- a/photoprism/docker-compose.yml
+++ b/photoprism/docker-compose.yml
@ -1,13 +1,15 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_PHOTOPRISM_IP
+      APP_PORT: $APP_PHOTOPRISM_PORT
  web:
    image: photoprism/photoprism:20210925@sha256:238e6955804d82097d08f0e4318835721f46bd844f9065a38aa7d112ab72906e
    user: "1000:1000"
    restart: on-failure
    stop_grace_period: "1m"
-    ports:
-      - ${APP_PHOTOPRISM_PORT}:${APP_PHOTOPRISM_PORT}
    volumes:
      - "${APP_DATA_DIR}/originals:/photoprism/originals"
      - "${APP_DATA_DIR}/storage:/photoprism/storage"
--- a/photoprism/torrc.template
+++ b/photoprism/torrc.template
@ -1,3 +0,0 @@
-# photoprism Hidden Service
-HiddenServiceDir /data/app-photoprism
-HiddenServicePort 80 $APP_PHOTOPRISM_IP:$APP_PHOTOPRISM_PORT
--- a/photoprism/umbrel-app.yml
+++ b/photoprism/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: photoprism
 category: Files
 name: PhotoPrism
--- a/pi-hole/docker-compose.yml
+++ b/pi-hole/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_PI_HOLE_IP
+      APP_PORT: 80
  server:
    image: pihole/pihole:2022.01.1@sha256:a02faea91d505d0bfc1583049f3e943f2c3afe03df574e625ffa828b16b85832
    # Pi-hole doesn't currently support running as non-root
@ -10,7 +14,6 @@ services:
    ports:
      - 53:53
      - 53:53/udp
-      - ${APP_PI_HOLE_PORT}:80
    volumes:
      - ${APP_DATA_DIR}/data/pihole:/etc/pihole/
      - ${APP_DATA_DIR}/data/dnsmasq:/etc/dnsmasq.d/
--- a/pi-hole/torrc.template
+++ b/pi-hole/torrc.template
@ -1,3 +0,0 @@
-# pi-hole Hidden Service
-HiddenServiceDir /data/app-pi-hole
-HiddenServicePort 80 $APP_PI_HOLE_IP:80
--- a/pi-hole/umbrel-app.yml
+++ b/pi-hole/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: pi-hole
 category: Networking
 name: Pi-hole
--- a/ride-the-lightning/docker-compose.yml
+++ b/ride-the-lightning/docker-compose.yml
@ -1,13 +1,15 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_RIDE_THE_LIGHTNING_IP
+      APP_PORT: $APP_RIDE_THE_LIGHTNING_PORT
  web:
    image: shahanafarooqui/rtl:0.12.1@sha256:8589a880f6357e5ea5cc3826e1704f4e91de324067f34388586faa0395204725
    user: "1000:1000"
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "$APP_RIDE_THE_LIGHTNING_PORT:$APP_RIDE_THE_LIGHTNING_PORT"
    volumes:
      - ${APP_DATA_DIR}/rtl:/data
      - ${APP_DATA_DIR}/loop:/loop
--- a/ride-the-lightning/torrc.template
+++ b/ride-the-lightning/torrc.template
@ -1,3 +0,0 @@
-# ride-the-lightning Hidden Service
-HiddenServiceDir /data/app-ride-the-lightning
-HiddenServicePort 80 $APP_RIDE_THE_LIGHTNING_IP:$APP_RIDE_THE_LIGHTNING_PORT
--- a/ride-the-lightning/umbrel-app.yml
+++ b/ride-the-lightning/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: ride-the-lightning
 category: Lightning Node Management
 name: Ride The Lightning
--- a/samourai-server/docker-compose.yml
+++ b/samourai-server/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SAMOURAI_SERVER_IP
+      APP_PORT: 8081
  db:
    image: louneskmt/dojo-db:1.5.0-low-mem@sha256:e82c23699196bcaf37fe021ca47eef1c53d18ba8a10290ae8dcfe7cb24dbb5e6
    init: true
@ -132,7 +136,6 @@ services:
      WHIRLPOOL_API_KEY: $SAMOURAI_SERVER_WHIRLPOOL_API_KEY
    ports:
      - "$APP_SAMOURAI_SERVER_DOJO_PORT:80"
-      - "$APP_SAMOURAI_SERVER_CONNECT_PORT:8081"
    depends_on:
      - node
    networks:
--- a/samourai-server/exports.sh
+++ b/samourai-server/exports.sh
@ -6,8 +6,8 @@ export APP_SAMOURAI_SERVER_WHIRLPOOL_PORT="8898"
 export APP_SAMOURAI_SERVER_DB_IP="10.21.21.24"
 export APP_SAMOURAI_SERVER_NODE_IP="10.21.21.25"

-dojo_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-dojo/hostname"
-whirlpool_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-whirlpool/hostname"
+dojo_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-dojo/hostname"
+whirlpool_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-whirlpool/hostname"
 export SAMOURAI_SERVER_DOJO_HIDDEN_SERVICE="$(cat "${dojo_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"
 export SAMOURAI_SERVER_WHIRLPOOL_HIDDEN_SERVICE="$(cat "${whirlpool_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"
 export SAMOURAI_SERVER_NODE_API_KEY=$(derive_entropy "env-${app_entropy_identifier}-NODE_API_KEY")
--- a/samourai-server/umbrel-app.yml
+++ b/samourai-server/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: samourai-server
 category: Wallet Servers
 name: Samourai Server
--- a/satsale/docker-compose.yml
+++ b/satsale/docker-compose.yml
@ -1,6 +1,10 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SATSALE_IP
+      APP_PORT: 5000
  satsale:
    image: satsale/satsale:0.1.13@sha256:98380ad6c5166d83e627c4d1f4efdbcfd5b9217096f7fb26b287fda89eebccbb
    restart: on-failure
@ -8,8 +12,6 @@ services:
    volumes:
      - ${APP_DATA_DIR}/data:/data
      - ${LND_DATA_DIR}:/lnd:ro
-    ports:
-      - ${APP_SATSALE_PORT}:5000
    environment:
      DATA_DIR: "/data"
      # Lightning node connection details
--- a/satsale/torrc.template
+++ b/satsale/torrc.template
@ -1,3 +0,0 @@
-# satsale Hidden Service
-HiddenServiceDir /data/app-satsale
-HiddenServicePort 80 $APP_SATSALE_IP:5000
--- a/satsale/umbrel-app.yml
+++ b/satsale/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: satsale
 category: Finance
 name: SatSale
--- a/simple-torrent/docker-compose.yml
+++ b/simple-torrent/docker-compose.yml
@ -1,12 +1,15 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SIMPLE_TORRENT_IP
+      APP_PORT: $APP_SIMPLETORRENT_PORT
+
  server:
    image: boypt/cloud-torrent:1.3.4@sha256:a1355e9ac319d523ce1fd6e8d34ab8e4bf0b5476c52bfe244e37fea64f6f4228
    user: "1000:1000"
    restart: on-failure
-    ports:
-      - "${APP_SIMPLETORRENT_PORT}:${APP_SIMPLETORRENT_PORT}"
    command: >
      --port=${APP_SIMPLE_TORRENT_PORT}
      --config-path /config/simple-torrent.json
--- a/simple-torrent/torrc.template
+++ b/simple-torrent/torrc.template
@ -1,3 +0,0 @@
-# simple-torrent Hidden Service
-HiddenServiceDir /data/app-simple-torrent
-HiddenServicePort 80 $APP_SIMPLE_TORRENT_IP:$APP_SIMPLE_TORRENT_PORT
--- a/simple-torrent/umbrel-app.yml
+++ b/simple-torrent/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: simple-torrent
 category: Networking
 name: SimpleTorrent
--- a/snowflake/docker-compose.yml
+++ b/snowflake/docker-compose.yml
@ -1,6 +1,11 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SNOWFLAKE_IP
+      APP_PORT: $APP_SNOWFLAKE_PORT
+
  proxy:
    image: getumbrel/snowflake:v2.1.0@sha256:875a513540a132752a4b09f5d6de4ed41399c5331265d6576dcfb5952bb22053
    restart: on-failure
@ -16,8 +21,6 @@ services:
    image: getumbrel/gotty:v1.0.1@sha256:100571d271cfbae25603acac216afce511eece9961218c6db427e0fa4a58716a
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-     - $APP_SNOWFLAKE_PORT:$APP_SNOWFLAKE_PORT
    command: --port $APP_SNOWFLAKE_PORT --index "/snowflake/index.html" --title-format "Tor Snowflake Proxy" bash -c 'tail -n 10000 -f /snowflake/snowflake.log | grep "Traffic Relayed"'
    volumes:
      - ${APP_DATA_DIR}/data:/snowflake
--- a/snowflake/torrc.template
+++ b/snowflake/torrc.template
@ -1,3 +0,0 @@
-# snowflake Hidden Service
-HiddenServiceDir /data/app-snowflake
-HiddenServicePort 80 $APP_SNOWFLAKE_IP:$APP_SNOWFLAKE_PORT
--- a/snowflake/umbrel-app.yml
+++ b/snowflake/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: snowflake
 category: Networking
 name: Tor Snowflake Proxy
--- a/sparkkiosk/docker-compose.yml
+++ b/sparkkiosk/docker-compose.yml
@ -1,14 +1,17 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SPARKKIOSK_IP
+      APP_PORT: 21214
+
  web:
    image: jensgertsen/sparkkiosk:v1.0.0@sha256:d49500ce9c47d04436e64dae7e336416aa32f83673058154aa8a983e1420008c
    user: 1000:1000
    init: true
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - $APP_SPARKKIOSK_PORT:21214
    volumes:
      - ${APP_DATA_DIR}/data:/data
      - ${LND_DATA_DIR}:/lnd:ro
--- a/sparkkiosk/torrc.template
+++ b/sparkkiosk/torrc.template
@ -1,3 +0,0 @@
-# sparkkiosk Hidden Service
-HiddenServiceDir /data/app-sparkkiosk
-HiddenServicePort 80 $APP_SPARKKIOSK_IP:21214
--- a/sparkkiosk/umbrel-app.yml
+++ b/sparkkiosk/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: sparkkiosk
 category: Finance
 name: Sparkkiosk
--- a/specter-desktop/docker-compose.yml
+++ b/specter-desktop/docker-compose.yml
@ -1,13 +1,16 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SPECTER_DESKTOP_IP
+      APP_PORT: $APP_SPECTER_DESKTOP_PORT
+
  web:
    image: lncm/specter-desktop:v1.8.1@sha256:0fab344245e0b3fb27b8d62a74e2503e53d1a51ab8b9c8a6170f975bf880a70a
    stop_signal: SIGINT
    restart: on-failure
    stop_grace_period: 1m
-    ports:
-      - "$APP_SPECTER_DESKTOP_PORT:$APP_SPECTER_DESKTOP_PORT"
    volumes:
      - ${APP_DATA_DIR}/data:/data
    command:
--- a/specter-desktop/torrc.template
+++ b/specter-desktop/torrc.template
@ -1,3 +0,0 @@
-# specter-desktop Hidden Service
-HiddenServiceDir /data/app-specter-desktop
-HiddenServicePort 80 $APP_SPECTER_DESKTOP_IP:$APP_SPECTER_DESKTOP_PORT
--- a/specter-desktop/umbrel-app.yml
+++ b/specter-desktop/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: specter-desktop
 category: Wallets
 name: Specter Desktop
--- a/sphinx-relay/docker-compose.yml
+++ b/sphinx-relay/docker-compose.yml
@ -1,6 +1,11 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SPHINX_RELAY_IP
+      APP_PORT: $APP_SPHINX_RELAY_PORT
+
  sphinx-relay:
    container_name: sphinx-relay
    image: sphinxlightning/sphinx-relay:v2.2.5@sha256:9c7b112ead4585a92b6d65ebaa6206cf64069813b382b361c6c928c0def8a682
@ -10,8 +15,6 @@ services:
    volumes:
      - ${LND_DATA_DIR}:/lnd:ro
      - ${APP_DATA_DIR}/data:/relay/.lnd/
-    ports:
-      - "$APP_SPHINX_RELAY_PORT:$APP_SPHINX_RELAY_PORT"
    environment:
      PUBLIC_URL: "$APP_HIDDEN_SERVICE:$APP_SPHINX_RELAY_PORT"
      LND_IP: $LND_IP
--- a/sphinx-relay/umbrel-app.yml
+++ b/sphinx-relay/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: sphinx-relay
 category: Social
 name: Sphinx Relay
--- a/squeaknode/docker-compose.yml
+++ b/squeaknode/docker-compose.yml
@ -1,12 +1,16 @@
 version: "3.7"

 services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_SQUEAKNODE_IP
+      APP_PORT: $APP_SQUEAKNODE_PORT
+
  web:
    image: ghcr.io/squeaknode/squeaknode:v0.2.16@sha256:25d9bd4ce22b4265979d64ce9a2417c883492cd8dce7f171fc5488d27db6c809
    restart: on-failure
    stop_grace_period: 1m
    ports:
-      - "$APP_SQUEAKNODE_PORT:$APP_SQUEAKNODE_PORT"
      - "$APP_SQUEAKNODE_GRPC_PORT:$APP_SQUEAKNODE_GRPC_PORT"
    volumes:
      - ${APP_DATA_DIR}/sqk:/sqk
--- a/squeaknode/exports.sh
+++ b/squeaknode/exports.sh
@ -2,4 +2,7 @@ export APP_SQUEAKNODE_IP="10.21.21.54"
 export APP_SQUEAKNODE_PORT="12994"
 export APP_SQUEAKNODE_GRPC_PORT="8994"
 export APP_SQUEAKNODE_P2P_PORT="8555"
-export APP_SQUEAKNODE_P2P_TESTNET_PORT="18555"
+export APP_SQUEAKNODE_P2P_TESTNET_PORT="18555"
+
+squeaknode_p2p_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-p2p/hostname"
+export SQUEAKNODE_P2P_HIDDEN_SERVICE="$(cat "${squeaknode_p2p_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" 
--- a/squeaknode/umbrel-app.yml
+++ b/squeaknode/umbrel-app.yml
@ -1,4 +1,4 @@
-manifest: 1
+manifestVersion: 1
 id: squeaknode
 category: Social
 name: Squeaknode