Remove hard-coded container IPs (#310)

Co-authored-by: Steven Briscoe <me@stevenbriscoe.com>
This commit is contained in:
Steven Briscoe 2022-12-05 04:18:22 +08:00 committed by GitHub
parent 8a46aed473
commit 11f36560e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
123 changed files with 177 additions and 575 deletions

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_BITFEED_IP
APP_HOST: bitfeed_web_1
APP_PORT: 80
web:
@ -14,11 +14,8 @@ services:
- "api"
environment:
TARGET: "umbrel"
BACKEND_HOST: "$APP_BITFEED_API_IP"
BACKEND_PORT: "$APP_BITFEED_API_PORT"
networks:
default:
ipv4_address: $APP_BITFEED_IP
BACKEND_HOST: bitfeed_api_1
BACKEND_PORT: 8315
api:
image: ghcr.io/bitfeed-project/bitfeed-server:v2.3.4@sha256:e38a2e07389cf6d0c519e856291e535fdd10a1e50143d528c82bfe0baf06894f
@ -26,7 +23,7 @@ services:
restart: on-failure
stop_grace_period: 1m
environment:
PORT: "$APP_BITFEED_API_PORT"
PORT: 8315
BITCOIN_HOST: "$APP_BITCOIN_NODE_IP"
BITCOIN_ZMQ_RAWTX_PORT: "$APP_BITCOIN_ZMQ_RAWTX_PORT"
BITCOIN_ZMQ_RAWBLOCK_PORT: "$APP_BITCOIN_ZMQ_RAWBLOCK_PORT"
@ -40,6 +37,3 @@ services:
LOG_LEVEL: "info"
volumes:
- ${APP_DATA_DIR}/data:/app/data
networks:
default:
ipv4_address: $APP_BITFEED_API_IP

View File

@ -1,4 +0,0 @@
export APP_BITFEED_IP="10.21.21.68"
export APP_BITFEED_PORT="8314"
export APP_BITFEED_API_IP="10.21.21.69"
export APP_BITFEED_API_PORT="8315"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_BLESKOMAT_SERVER_IP
APP_PORT: $APP_BLESKOMAT_SERVER_PORT
APP_HOST: bleskomat-server_web_1
APP_PORT: 3333
PROXY_AUTH_ADD: "false"
db:
@ -14,9 +14,6 @@ services:
stop_grace_period: 1m
volumes:
- $APP_DATA_DIR/data/db:/var/lib/postgresql/data
networks:
default:
ipv4_address: $APP_BLESKOMAT_SERVER_DB_IP
environment:
- POSTGRES_USER=bleskomat_server
- POSTGRES_DB=bleskomat_server
@ -35,17 +32,13 @@ services:
environment:
DEBUG: "bleskomat-server*,lnurl*"
BLESKOMAT_SERVER_HOST: "0.0.0.0"
BLESKOMAT_SERVER_PORT: "$APP_BLESKOMAT_SERVER_PORT"
BLESKOMAT_SERVER_PORT: 3333
BLESKOMAT_SERVER_URL: "$APP_HIDDEN_SERVICE"
BLESKOMAT_SERVER_ENDPOINT: "/u"
BLESKOMAT_SERVER_AUTH_API_KEYS: '[]'
BLESKOMAT_SERVER_LIGHTNING: '{"backend":"lnd","config":{"cert":"/lnd/tls.cert","protocol":"https","hostname":"$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT","macaroon":"/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon"}}'
BLESKOMAT_SERVER_STORE: '{"backend":"knex","config":{"client":"postgres","connection":{"host":"$APP_BLESKOMAT_SERVER_DB_IP","port":5432,"user":"bleskomat_server","password":"moneyprintergobrrr","database":"bleskomat_server"}}}'
BLESKOMAT_SERVER_STORE: '{"backend":"knex","config":{"client":"postgres","connection":{"host":"bleskomat-server_db_1","port":5432,"user":"bleskomat_server","password":"moneyprintergobrrr","database":"bleskomat_server"}}}'
BLESKOMAT_SERVER_COINRATES_DEFAULTS_PROVIDER: "coinbase"
BLESKOMAT_SERVER_ADMIN_WEB: "true"
BLESKOMAT_SERVER_ADMIN_PASSWORD_PLAINTEXT: "$APP_PASSWORD"
BLESKOMAT_SERVER_ENV_FILEPATH: "./data/.env"
networks:
default:
ipv4_address: $APP_BLESKOMAT_SERVER_IP

View File

@ -1,3 +0,0 @@
export APP_BLESKOMAT_SERVER_PORT="3333"
export APP_BLESKOMAT_SERVER_IP="10.21.21.85"
export APP_BLESKOMAT_SERVER_DB_IP="10.21.21.86"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_BLUEWALLET_LNDHUB_IP
APP_PORT: $APP_BLUEWALLET_LNDHUB_PORT
APP_HOST: bluewallet_lndhub_1
APP_PORT: 3008
PROXY_AUTH_ADD: "false"
redis:
@ -16,9 +16,6 @@ services:
init: true
volumes:
- "${APP_DATA_DIR}/data/redis:/data"
networks:
default:
ipv4_address: "${APP_BLUEWALLET_REDIS_IP}"
lndhub:
image: "bluewalletorganization/lndhub:v1.4.1@sha256:db673a8d360982984d05f97303e26dc0e5a3eea36ba54d0abdae5bbbeef31d3a"
@ -30,11 +27,8 @@ services:
volumes:
- "${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro"
environment:
PORT: "${APP_BLUEWALLET_LNDHUB_PORT}"
PORT: 3008
TOR_URL: "${APP_HIDDEN_SERVICE}"
LND_CERT_FILE: "/lnd/tls.cert"
LND_ADMIN_MACAROON_FILE: "/lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/admin.macaroon"
CONFIG: '{ "rateLimit": 10000, "postRateLimit": 10000, "redis": { "port": 6379, "host": "$APP_BLUEWALLET_REDIS_IP", "family": 4, "password": "moneyprintergobrrr", "db": 0 }, "lnd": { "url": "$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT", "password": ""}}'
networks:
default:
ipv4_address: "${APP_BLUEWALLET_LNDHUB_IP}"
CONFIG: '{ "rateLimit": 10000, "postRateLimit": 10000, "redis": { "port": 6379, "host": "bluewallet_redis_1", "family": 4, "password": "moneyprintergobrrr", "db": 0 }, "lnd": { "url": "$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT", "password": ""}}'

View File

@ -1,3 +0,0 @@
export APP_BLUEWALLET_LNDHUB_IP="10.21.21.30"
export APP_BLUEWALLET_LNDHUB_PORT="3008"
export APP_BLUEWALLET_REDIS_IP="10.21.21.31"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_BTCPAY_SERVER_IP
APP_PORT: $APP_BTCPAY_SERVER_PORT
APP_HOST: btcpay-server_web_1
APP_PORT: 3003
PROXY_AUTH_ADD: "false"
nbxplorer:
@ -25,12 +25,9 @@ services:
NBXPLORER_BTCNODEENDPOINT: $APP_BITCOIN_NODE_IP:$APP_BITCOIN_P2P_PORT
NBXPLORER_BTCRPCUSER: $APP_BITCOIN_RPC_USER
NBXPLORER_BTCRPCPASSWORD: $APP_BITCOIN_RPC_PASS
NBXPLORER_POSTGRES: User ID=postgres;Host=$APP_BTCPAY_SERVER_DB_IP;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
NBXPLORER_POSTGRES: User ID=postgres;Host=btcpay-server_postgres_1;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
NBXPLORER_AUTOMIGRATE: 1
NBXPLORER_NOMIGRATEEVTS: 1
networks:
default:
ipv4_address: $APP_BTCPAY_SERVER_NBXPLORER_IP
web:
image: btcpayserver/btcpayserver:1.6.12@sha256:41768be32374ebc4f64050ad5e56ffef8834ccacbff0440c0938a493abcec252
@ -48,17 +45,14 @@ services:
BTCPAY_DATADIR: "/data"
BTCPAY_PLUGINDIR: "/data/plugins"
BTCPAY_DOCKERDEPLOYMENT: "false"
BTCPAY_POSTGRES: "User ID=postgres;Host=$APP_BTCPAY_SERVER_DB_IP;Port=5432;Database=btcpayserver$APP_BITCOIN_NETWORK"
BTCPAY_POSTGRES: "User ID=postgres;Host=btcpay-server_postgres_1;Port=5432;Database=btcpayserver$APP_BITCOIN_NETWORK"
BTCPAY_NETWORK: "$APP_BITCOIN_NETWORK"
BTCPAY_BIND: 0.0.0.0:$APP_BTCPAY_SERVER_PORT
BTCPAY_BIND: 0.0.0.0:3003
BTCPAY_CHAINS: "btc"
BTCPAY_BTCEXPLORERURL: "http://$APP_BTCPAY_SERVER_NBXPLORER_IP:32838"
BTCPAY_BTCEXPLORERURL: "http://btcpay-server_nbxplorer_1:32838"
BTCPAY_BTCLIGHTNING: "type=lnd-rest;server=https://$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT/;macaroonfilepath=/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon;allowinsecure=true"
BTCPAY_SOCKSENDPOINT: $TOR_PROXY_IP:$TOR_PROXY_PORT
BTCPAY_EXPLORERPOSTGRES: User ID=postgres;Host=$APP_BTCPAY_SERVER_DB_IP;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
networks:
default:
ipv4_address: $APP_BTCPAY_SERVER_IP
BTCPAY_EXPLORERPOSTGRES: User ID=postgres;Host=btcpay-server_postgres_1;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer$APP_BITCOIN_NETWORK
postgres:
image: btcpayserver/postgres:13.7@sha256:dadf0048895a888d88a2dd773dde2f5868c45f74ad37c6d208694df54b590531
@ -72,6 +66,3 @@ 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

View File

@ -1,4 +0,0 @@
export APP_BTCPAY_SERVER_IP="10.21.21.19"
export APP_BTCPAY_SERVER_PORT="3003"
export APP_BTCPAY_SERVER_NBXPLORER_IP="10.21.21.20"
export APP_BTCPAY_SERVER_DB_IP="10.21.21.21"

View File

@ -1,13 +1,13 @@
version: "2.1"
version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_CALIBRE_WEB_IP
APP_PORT: $APP_CALIBRE_WEB_PORT
APP_HOST: calibre-web_server_1
APP_PORT: 8083
calibre-web:
server:
image: linuxserver/calibre-web:0.6.19@sha256:898987a2276b7f175f9ae787ef2b7f3f91103a3e621dffe7b67b3a9feae1b922
container_name: calibre-web
stop_grace_period: 1m
environment:
- PUID=1000
@ -16,6 +16,3 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${APP_DATA_DIR}/data/books:/books
restart: on-failure
networks:
default:
ipv4_address: $APP_CALIBRE_WEB_IP

View File

@ -1,2 +0,0 @@
export APP_CALIBRE_WEB_IP="10.21.21.106"
export APP_CALIBRE_WEB_PORT="8083"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_CODE_SERVER_IP
APP_HOST: code-server_server_1
APP_PORT: 8080
server:
@ -14,6 +14,3 @@ services:
- ${APP_DATA_DIR}/data:/home/coder
environment:
PASSWORD: $APP_PASSWORD
networks:
default:
ipv4_address: $APP_CODE_SERVER_IP

View File

@ -1,2 +0,0 @@
export APP_CODE_SERVER_IP="10.21.21.53"
export APP_CODE_SERVER_PORT="8091"

View File

@ -3,10 +3,10 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_CORE_LIGHTNING_RTL_IP
APP_HOST: core-lightning-rtl_web_1
APP_PORT: 3000
rtl:
web:
image: shahanafarooqui/rtl:0.13.2@sha256:07d4c1f263c05c32270dcaab3625fc68ef985efce652e7850fbf57f65d36366f
restart: on-failure
environment:
@ -19,7 +19,4 @@ services:
RTL_COOKIE_PATH: /data/.cookie
volumes:
- "${APP_DATA_DIR}/data/rtl:/data"
- "${APP_CORE_LIGHTNING_REST_CERT_DIR}:/c-lightning-rest/certs"
networks:
default:
ipv4_address: ${APP_CORE_LIGHTNING_RTL_IP}
- "${APP_CORE_LIGHTNING_REST_CERT_DIR}:/c-lightning-rest/certs"

View File

@ -1 +0,0 @@
export APP_CORE_LIGHTNING_RTL_IP="10.21.21.97"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_ELEMENT_IP
APP_HOST: element_web_1
APP_PORT: 80
web:
@ -12,6 +12,3 @@ services:
# user: "1000:1000"
restart: on-failure
stop_grace_period: 1m
networks:
default:
ipv4_address: $APP_ELEMENT_IP

View File

@ -1,2 +0,0 @@
export APP_ELEMENT_IP="10.21.21.45"
export APP_ELEMENT_PORT="8088"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_ELEMENTS_IP
APP_HOST: elements_web_1
APP_PORT: 8080
node:
@ -38,9 +38,6 @@ services:
- -port=$APP_ELEMENTS_NODE_P2P_PORT
- -blockfilterindex=1
- -peerblockfilters=1
networks:
default:
ipv4_address: $APP_ELEMENTS_NODE_IP
web:
image: ghcr.io/tiero/elements-web:v0.0.3@sha256:b80dc0df2a4693668a97b874aad6d0a8d3239d03f4d05b4342600166934d0b87
@ -51,14 +48,11 @@ services:
RPC_USER: elements
RPC_PASS: $APP_PASSWORD
RPC_PORT: $APP_ELEMENTS_NODE_RPC_PORT
RPC_HOST: $APP_ELEMENTS_NODE_IP
RPC_HOST: elements_node_1
P2P_PORT: $APP_ELEMENTS_NODE_P2P_PORT
# Remote
REMOTE_RPC_HOST: $APP_ELEMENTS_RPC_HIDDEN_SERVICE
REMOTE_P2P_HOST: $APP_ELEMENTS_P2P_HIDDEN_SERVICE
networks:
default:
ipv4_address: $APP_ELEMENTS_IP
tor:
image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a

View File

@ -1,6 +1,3 @@
export APP_ELEMENTS_PORT="3042"
export APP_ELEMENTS_IP="10.21.21.91"
export APP_ELEMENTS_NODE_IP="10.21.21.92"
export APP_ELEMENTS_NODE_RPC_PORT="7041"
export APP_ELEMENTS_NODE_P2P_PORT="18332"

View File

@ -1,7 +1,7 @@
# elements rpc Hidden Service
HiddenServiceDir /data/app-$APP_ID-rpc
HiddenServicePort $APP_ELEMENTS_NODE_RPC_PORT $APP_ELEMENTS_NODE_IP:$APP_ELEMENTS_NODE_RPC_PORT
HiddenServicePort $APP_ELEMENTS_NODE_RPC_PORT elements_node_1:$APP_ELEMENTS_NODE_RPC_PORT
# 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
HiddenServicePort $APP_ELEMENTS_NODE_P2P_PORT elements_node_1:$APP_ELEMENTS_NODE_P2P_PORT

View File

@ -3,14 +3,11 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_ESPHOME_IP
APP_HOST: esphome_server_1
APP_PORT: 6052
server:
image: esphome/esphome:2022.6.2@sha256:1fac6334b85e76c7fd936036891b7a7ee761ee73fd119662b2cb564c3faf818f
volumes:
- ${APP_DATA_DIR}/data:/config
networks:
default:
ipv4_address: $APP_ESPHOME_IP
restart: on-failure

View File

@ -1,2 +0,0 @@
export APP_ESPHOME_PORT="6052"
export APP_ESPHOME_IP="10.21.21.104"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_GITEA_IP
APP_PORT: $APP_GITEA_PORT
APP_HOST: gitea_server_1
APP_PORT: 8085
PROXY_AUTH_ADD: "false"
server:
@ -19,19 +19,16 @@ services:
environment:
GITEA__security__INSTALL_LOCK: "true"
GITEA__server__DOMAIN: "${APP_DOMAIN}"
GITEA__server__HTTP_PORT: "${APP_GITEA_PORT}"
GITEA__server__HTTP_PORT: 8085
GITEA__server__SSH_DOMAIN: "${APP_DOMAIN}"
GITEA__server__SSH_PORT: "${APP_GITEA_SSH_PORT}"
GITEA__server__SSH_LISTEN_PORT: "${APP_GITEA_SSH_PORT}"
GITEA__server__START_SSH_SERVER: "true"
GITEA__database__DB_TYPE: "mysql"
GITEA__database__HOST: "${APP_GITEA_DB_IP}:3306"
GITEA__database__HOST: "gitea_db_1:3306"
GITEA__database__NAME: "gitea"
GITEA__database__USER: "gitea"
GITEA__database__PASSWD: "moneyprintergobrrr"
networks:
default:
ipv4_address: $APP_GITEA_IP
db:
image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd
@ -44,6 +41,3 @@ services:
MYSQL_USER: "gitea"
MYSQL_PASSWORD: "moneyprintergobrrr"
MYSQL_DATABASE: "gitea"
networks:
default:
ipv4_address: $APP_GITEA_DB_IP

View File

@ -1,5 +1,2 @@
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}"
export APP_GITEA_TOR_HS_EXTRA_PORTS="22:gitea_server_1:${APP_GITEA_SSH_PORT}"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_HELIPAD_IP
APP_HOST: helipad_web_1
APP_PORT: 2112
web:
@ -17,6 +17,3 @@ services:
- ${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro
environment:
LND_URL: "$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT"
networks:
default:
ipv4_address: $APP_HELIPAD_IP

View File

@ -1,2 +0,0 @@
export APP_HELIPAD_PORT="2112"
export APP_HELIPAD_IP="10.21.21.65"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_HOME_ASSISTANT_IP
APP_HOST: home-assistant_server_1
APP_PORT: 8123
PROXY_AUTH_ADD: "false"
@ -12,6 +12,3 @@ services:
volumes:
- ${APP_DATA_DIR}/data:/config
- ${APP_DATA_DIR}/configuration.yaml:/config/configuration.yaml
networks:
default:
ipv4_address: $APP_HOME_ASSISTANT_IP

View File

@ -1,2 +0,0 @@
export APP_HOME_ASSISTANT_PORT="8083"
export APP_HOME_ASSISTANT_IP="10.21.21.37"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_IPFS_PODCASTING_IP
APP_PORT: $APP_IPFS_PODCASTING_PORT
APP_HOST: ipfs-podcasting_web_1
APP_PORT: 8675
web:
image: ipfspodcasting/podcastnode:v0.6@sha256:773d7c34d452764be973e8bc495990ec47f8042287493997784198c64e924393
@ -13,10 +13,7 @@ services:
stop_grace_period: 1m
user: "1000:1000"
ports:
- ${APP_IPFS_PODCASTING_P2P_PORT}:4001 # IPFS
- 4001:4001 # IPFS P2P
volumes:
- ${APP_DATA_DIR}/ipfs:/ipfs-podcasting/ipfs
- ${APP_DATA_DIR}/cfg:/ipfs-podcasting/cfg
networks:
default:
ipv4_address: $APP_IPFS_PODCASTING_IP

View File

@ -1,3 +0,0 @@
export APP_IPFS_PODCASTING_IP="10.21.21.93"
export APP_IPFS_PODCASTING_PORT="8675"
export APP_IPFS_PODCASTING_P2P_PORT="4001"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_ITCHYSATS_IP
APP_HOST: itchysats_web_1
APP_PORT: 8000
web:
@ -19,7 +19,3 @@ services:
- --electrum=tcp://$APP_ELECTRS_NODE_IP:$APP_ELECTRS_NODE_PORT
environment:
- ITCHYSATS_ENV=umbrel
networks:
default:
ipv4_address: $APP_ITCHYSATS_IP

View File

@ -1,2 +0,0 @@
export APP_ITCHYSATS_IP="10.21.21.64"
export APP_ITCHYSATS_PORT="7113"

View File

@ -3,10 +3,10 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_JAM_IP
APP_HOST: jam_web_1
APP_PORT: 80
jam:
web:
image: ghcr.io/joinmarket-webui/jam-standalone:v0.1.3-clientserver-v0.9.8@sha256:5cc26732bb3a868c454be8568cc425065b04b07eda63baad24a4d9c44971bb5c
restart: on-failure
stop_grace_period: 1m
@ -25,6 +25,3 @@ services:
jm_rpc_user: $APP_BITCOIN_RPC_USER
jm_rpc_password: "${APP_BITCOIN_RPC_PASS}"
jm_rpc_wallet_file: jam_default
networks:
default:
ipv4_address: $APP_JAM_IP

View File

@ -1,2 +0,0 @@
export APP_JAM_IP="10.21.21.84"
export APP_JAM_PORT="5002"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_JELLYFIN_IP
APP_HOST: jellyfin_server_1
APP_PORT: 8096
PROXY_AUTH_ADD: "false"
@ -20,6 +20,3 @@ services:
ports:
# Service auto-discovery
- 7359:7359/udp
networks:
default:
ipv4_address: $APP_JELLYFIN_IP

View File

@ -1 +0,0 @@
export APP_JELLYFIN_IP="10.21.25.4"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_KOLLIDER_IP
APP_HOST: kollider_web_1
APP_PORT: 3000
backend:
@ -17,10 +17,7 @@ services:
- ${APP_DATA_DIR}/data/logs:/app/logs
environment:
LND_IP: $APP_LIGHTNING_NODE_IP
LND_ZMQ_SUB_ADDRESS: "tcp://${APP_KOLLIDER_WS_IP}:5556"
networks:
default:
ipv4_address: $APP_KOLLIDER_HH_IP
LND_ZMQ_SUB_ADDRESS: "tcp://kollider_ws_1:5556"
ws:
image: kolliderhq/kollider-ws-client:v1.0.6@sha256:05f3d1ddf9949b377788e442a1050457559291a50510f5d6dfa66a28c283a80a
@ -29,16 +26,13 @@ services:
restart: on-failure
stop_grace_period: 1m
ports:
- "$APP_KOLLIDER_WS_PORT:8080"
- "4244:8080"
environment:
APP_PASSWORD: $APP_PASSWORD
KOLLIDER_ZMQ_PUB_ADDRESS: "tcp://*:5556"
KOLLIDER_ZMQ_SUB_ADDRESS: "tcp://${APP_KOLLIDER_HH_IP}:5557"
KOLLIDER_ZMQ_HEDGER_ADDRESS: "tcp://${APP_KOLLIDER_HH_IP}:5558"
KOLLIDER_ZMQ_HEDGER_SUB_ADDRESS: "tcp://${APP_KOLLIDER_HH_IP}:5559"
networks:
default:
ipv4_address: $APP_KOLLIDER_WS_IP
KOLLIDER_ZMQ_SUB_ADDRESS: "tcp://kollider_backend_1:5557"
KOLLIDER_ZMQ_HEDGER_ADDRESS: "tcp://kollider_backend_1:5558"
KOLLIDER_ZMQ_HEDGER_SUB_ADDRESS: "tcp://kollider_backend_1:5559"
web:
image: kolliderhq/kollider-lite-app:v1.0.6@sha256:f5bbbea86ed4d03c9a7c66527edbcda05228986ba5721e65c08a885edb74151a
@ -48,6 +42,3 @@ services:
stop_grace_period: 1m
volumes:
- ${APP_DATA_DIR}/data/cache/images:/app/.next/cache/images
networks:
default:
ipv4_address: $APP_KOLLIDER_IP

View File

@ -1,6 +1 @@
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"
export APP_KOLLIDER_TOR_HS_EXTRA_PORTS="4244:kollider_ws_1:8080"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_KRYSTAL_BULL_IP
APP_HOST: krystal-bull_web_1
APP_PORT: 3001
web:
@ -17,13 +17,10 @@ services:
environment:
LOG_PATH: "/log/"
BITCOIN_S_HOME: "/bitcoin-s/"
ORACLE_SERVER_API_URL: "http://${APP_KRYSTAL_BULL_SERVER_IP}:9998/"
ORACLE_SERVER_API_URL: "http://krystal-bull_oracleserver_1:9998/"
TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT}
DEFAULT_UI_PASSWORD: "none"
BITCOIN_S_ORACLE_RPC_PASSWORD: $APP_PASSWORD
networks:
default:
ipv4_address: $APP_KRYSTAL_BULL_IP
depends_on:
- oracleserver
@ -39,6 +36,3 @@ services:
BITCOIN_S_ORACLE_RPC_PASSWORD: $APP_PASSWORD
DISABLE_JLINK: "1"
JAVA_OPTS: "-Xmx256m"
networks:
default:
ipv4_address: $APP_KRYSTAL_BULL_SERVER_IP

View File

@ -1,3 +0,0 @@
export APP_KRYSTAL_BULL_IP="10.21.21.56"
export APP_KRYSTAL_BULL_PORT="3010"
export APP_KRYSTAL_BULL_SERVER_IP="10.21.21.57"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_LIDARR_IP
APP_PORT: $APP_LIDARR_PORT
APP_HOST: lidarr_server_1
APP_PORT: 8686
PROXY_AUTH_WHITELIST: "/api/*"
server:
@ -16,9 +16,6 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
restart: on-failure
networks:
default:
ipv4_address: $APP_LIDARR_IP
mac:
image: getumbrel/media-app-configurator:v1.0.0@sha256:e3d8b18e0186f76dd3f3d4acacc9101b4abbf302d8f2afbb47cdd3879b1a1008
@ -28,8 +25,8 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
environment:
DOWNLOAD_CLIENT_API_URL: "http://${APP_LIDARR_IP}:${APP_LIDARR_PORT}/api/v1/downloadclient"
ROOT_FOLDER_API_URL: "http://${APP_LIDARR_IP}:${APP_LIDARR_PORT}/api/v1/rootfolder"
DOWNLOAD_CLIENT_API_URL: "http://lidarr_server_1:8686/api/v1/downloadclient"
ROOT_FOLDER_API_URL: "http://lidarr_server_1:8686/api/v1/rootfolder"
TRANSMISSION_HOST: "transmission_server_1"
TRANSMISSION_PORT: 9091
ROOT_FOLDER: "/downloads/music"

View File

@ -1,2 +0,0 @@
export APP_LIDARR_IP="10.21.25.7"
export APP_LIDARR_PORT=8686

View File

@ -3,8 +3,9 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_LIGHTNING_SHELL_IP
APP_HOST: lightning-shell_web_1
APP_PORT: 7681
web:
image: ghcr.io/ibz/lightning-shell:v0.1.10-buster-slim@sha256:4ea6aafee8ddd092b27850bccef71458d9e382e63d12b159d075bfde328ebef3
restart: on-failure
@ -20,6 +21,3 @@ services:
BITCOIN_RPC_PASS: "${APP_BITCOIN_RPC_PASS}"
LND_IP: "${APP_LIGHTNING_NODE_IP}"
LND_GRPC_PORT: ${APP_LIGHTNING_NODE_GRPC_PORT}
networks:
default:
ipv4_address: $APP_LIGHTNING_SHELL_IP

View File

@ -1,2 +0,0 @@
export APP_LIGHTNING_SHELL_PORT="7681"
export APP_LIGHTNING_SHELL_IP="10.21.21.66"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_LIGHTNING_TERMINAL_IP
APP_PORT: $APP_LIGHTNING_TERMINAL_PORT
APP_HOST: lightning-terminal_web_1
APP_PORT: 3004
web:
image: lightninglabs/lightning-terminal:v0.8.3-alpha@sha256:467a4e73b1bc1dd64e32ee75bea5d2343a5b500efa97d61205da18eeb4768723
@ -19,12 +19,9 @@ services:
APP_PASSWORD: "$APP_PASSWORD"
command:
- --uipassword_env=APP_PASSWORD
- --insecure-httplisten=0.0.0.0:$APP_LIGHTNING_TERMINAL_PORT
- --insecure-httplisten=0.0.0.0:3004
- --network="$APP_BITCOIN_NETWORK"
- --lnd-mode="remote"
- --remote.lnd.rpcserver=$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT
- --remote.lnd.macaroonpath="/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon"
- --remote.lnd.tlscertpath="/lnd/tls.cert"
networks:
default:
ipv4_address: $APP_LIGHTNING_TERMINAL_IP

View File

@ -1,2 +0,0 @@
export APP_LIGHTNING_TERMINAL_IP="10.21.21.17"
export APP_LIGHTNING_TERMINAL_PORT="3004"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_LN_VISUALIZER_WEB_IP
APP_HOST: ln-visualizer_web_1
APP_PORT: 80
web:
@ -12,10 +12,7 @@ services:
restart: on-failure
stop_grace_period: 1m
environment:
LN_VISUALIZER_API_URL: "http://${APP_LN_VISUALIZER_API_IP}:5647"
networks:
default:
ipv4_address: "${APP_LN_VISUALIZER_WEB_IP}"
LN_VISUALIZER_API_URL: "http://ln-visualizer_api_1:5647"
api:
image: maxkotlan/ln-visualizer-api:v0.0.26@sha256:818357452e3a16682b1abd3bc513b30c313703f6fd6e26d6e0c15267a248138b
@ -30,7 +27,3 @@ services:
LND_CERT_FILE: "/lnd/tls.cert"
LND_MACAROON_FILE: "/lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/readonly.macaroon"
LND_SOCKET: "${APP_LIGHTNING_NODE_IP}:${APP_LIGHTNING_NODE_GRPC_PORT}"
networks:
default:
ipv4_address: "${APP_LN_VISUALIZER_API_IP}"

View File

@ -1,2 +0,0 @@
export APP_LN_VISUALIZER_WEB_IP="10.21.21.102"
export APP_LN_VISUALIZER_API_IP="10.21.21.103"

View File

@ -3,9 +3,10 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_LNBITS_IP
APP_PORT: $APP_LNBITS_PORT
APP_HOST: lnbits_web_1
APP_PORT: 3007
PROXY_AUTH_ADD: "false"
web:
image: lnbitsdocker/lnbits-legend:0.9.4@sha256:0dbcc5ad5c5d4439c4ee5148206ecd3fbc28422aec2847a3f17e968205dab68b
init: true
@ -17,7 +18,7 @@ services:
environment:
# Global
LNBITS_HOST: "0.0.0.0"
LNBITS_PORT: "$APP_LNBITS_PORT"
LNBITS_PORT: 3007
LNBITS_DATA_FOLDER: "/data"
# LND
@ -31,6 +32,3 @@ services:
LNBITS_DEFAULT_WALLET_NAME: "LNbits wallet"
LNBITS_DISABLED_EXTENSIONS: "amilk"
LNBITS_ADMIN_EXTENSIONS: "ngrok"
networks:
default:
ipv4_address: $APP_LNBITS_IP

View File

@ -1,2 +0,0 @@
export APP_LNBITS_IP="10.21.21.29"
export APP_LNBITS_PORT="3007"

View File

@ -3,8 +3,9 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_LNDBOSS_IP
APP_PORT: $APP_LNDBOSS_PORT
APP_HOST: lndboss_web_1
APP_PORT: 8055
web:
image: niteshbalusu/lndboss:v2.12.0@sha256:d1a0454d22123dd95c0b8887d9c557937ac006d77d87a0391a9b4dc27e93b0c9
restart: on-failure
@ -15,8 +16,5 @@ services:
environment:
BOS_DATA_PATH: "/home/node/.bosgui"
NODE_ENV: "production"
PORT: $APP_LNDBOSS_PORT
PORT: 8055
BOS_DEFAULT_LND_SOCKET: $APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_GRPC_PORT
networks:
default:
ipv4_address: $APP_LNDBOSS_IP

View File

@ -1,2 +0,0 @@
export APP_LNDBOSS_IP="10.21.21.47"
export APP_LNDBOSS_PORT="8055"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_NEXTCLOUD_IP
APP_HOST: nextcloud_web_1
APP_PORT: 80
PROXY_AUTH_ADD: "false"
@ -19,9 +19,6 @@ services:
- MYSQL_PASSWORD=moneyprintergobrrr
- MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud
networks:
default:
ipv4_address: $APP_NEXTCLOUD_DB_IP
redis:
image: redis:6.2.2-buster@sha256:e10f55f92478715698a2cef97c2bbdc48df2a05081edd884938903aa60df6396
@ -29,9 +26,6 @@ services:
restart: on-failure
volumes:
- "${APP_DATA_DIR}/data/redis:/data"
networks:
default:
ipv4_address: $APP_NEXTCLOUD_REDIS_IP
web:
image: nextcloud:25.0.1-apache@sha256:a200319b132c01ec3486e0dcaf052092b560ec30ac9b78115607696dd201f704
@ -42,8 +36,8 @@ services:
volumes:
- ${APP_DATA_DIR}/data/nextcloud:/var/www/html
environment:
- MYSQL_HOST=${APP_NEXTCLOUD_DB_IP}
- REDIS_HOST=${APP_NEXTCLOUD_REDIS_IP}
- MYSQL_HOST=nextcloud_db_1
- REDIS_HOST=nextcloud_redis_1
- MYSQL_PASSWORD=moneyprintergobrrr
- MYSQL_DATABASE=nextcloud
- MYSQL_USER=nextcloud
@ -55,9 +49,6 @@ services:
depends_on:
- db
- redis
networks:
default:
ipv4_address: $APP_NEXTCLOUD_IP
cron:
image: nextcloud:25.0.1-apache@sha256:a200319b132c01ec3486e0dcaf052092b560ec30ac9b78115607696dd201f704
@ -71,6 +62,3 @@ services:
depends_on:
- db
- redis
networks:
default:
ipv4_address: $APP_NEXTCLOUD_CRON_IP

View File

@ -1,8 +1,4 @@
export APP_NEXTCLOUD_PORT="8081"
export APP_NEXTCLOUD_IP="10.21.21.32"
export APP_NEXTCLOUD_DB_IP="10.21.21.33"
export APP_NEXTCLOUD_REDIS_IP="10.21.21.34"
export APP_NEXTCLOUD_CRON_IP="10.21.21.35"
local_ips=$(hostname --all-ip-addresses 2> /dev/null) || local_ips=""
export APP_NEXTCLOUD_LOCAL_IPS="${local_ips}"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_NODE_RED_STANDALONE_IP
APP_PORT: $APP_NODE_RED_STANDALONE_PORT
APP_HOST: node-red-standalone_web_1
APP_PORT: 1881
# Used to allow (HTTP In) flows to be publicly exposed
PROXY_AUTH_WHITELIST: "/public/*"
@ -15,7 +15,4 @@ services:
volumes:
- ${APP_DATA_DIR}/data:/data
environment:
PORT: $APP_NODE_RED_STANDALONE_PORT
networks:
default:
ipv4_address: $APP_NODE_RED_STANDALONE_IP
PORT: 1881

View File

@ -1,2 +0,0 @@
export APP_NODE_RED_STANDALONE_IP="10.21.21.98"
export APP_NODE_RED_STANDALONE_PORT="1881"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_NODE_RED_IP
APP_PORT: $APP_NODE_RED_PORT
APP_HOST: node-red_web_1
APP_PORT: 1880
# Used to allow (HTTP In) flows to be publicly exposed
PROXY_AUTH_WHITELIST: "/public/*"
@ -16,7 +16,7 @@ services:
- ${APP_DATA_DIR}/data:/data
- ${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro
environment:
PORT: $APP_NODE_RED_PORT
PORT: 1880
BITCOIN_NETWORK: $APP_BITCOIN_NETWORK
BITCOIN_IP: $APP_BITCOIN_NODE_IP
BITCOIN_RPC_PORT: $APP_BITCOIN_RPC_PORT
@ -26,6 +26,3 @@ services:
LND_GRPC_PORT: $APP_LIGHTNING_NODE_GRPC_PORT
ELECTRUM_IP: $APP_ELECTRS_NODE_IP
ELECTRUM_PORT: $APP_ELECTRS_NODE_PORT
networks:
default:
ipv4_address: $APP_NODE_RED_IP

View File

@ -1,2 +0,0 @@
export APP_NODE_RED_IP="10.21.21.55"
export APP_NODE_RED_PORT="1880"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_OAK_NODE_IP
APP_PORT: $APP_OAK_NODE_PORT
APP_HOST: oak-node_web_1
APP_PORT: 8100
web:
image: oak-node.net/oak:v0.3.4@sha256:b4f218a453a10174492a1b03c66329dff89bdece26c0b024e1bffe9340141048
@ -16,7 +16,7 @@ services:
- ${APP_DATA_DIR}/data:/data
- ${APP_DATA_DIR}/log:/oak/log
environment:
ROCKET_PORT: $APP_OAK_NODE_PORT
ROCKET_PORT: 8100
ROCKET_ADDRESS: 0.0.0.0
OAK_DATA_DIR: /data
OAK_LND_REST_API_URL: https://$APP_LIGHTNING_NODE_IP:$APP_LIGHTNING_NODE_REST_PORT
@ -24,6 +24,3 @@ services:
OAK_LND_CERT_PATH: /lnd-dir/tls.cert
OAK_ONION_SOCKS5_HOST: $TOR_PROXY_IP
OAK_ONION_SOCKS5_PORT: $TOR_PROXY_PORT
networks:
default:
ipv4_address: $APP_OAK_NODE_IP

View File

@ -1,2 +0,0 @@
export APP_OAK_NODE_IP="10.21.21.105"
export APP_OAK_NODE_PORT="8100"

View File

@ -3,11 +3,12 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_PHOTOPRISM_IP
APP_PORT: $APP_PHOTOPRISM_PORT
APP_HOST: photoprism_web_1
APP_PORT: 8087
# These endpoints are protected by HTTP Basic Auth by Photoprism.
# More details here: https://docs.photoprism.app/user-guide/sync/webdav/#server-url
PROXY_AUTH_WHITELIST: "/originals/*,/import/*"
web:
image: photoprism/photoprism:221105-bullseye@sha256:52f2cfb9f46aec44dd2dec87c78ca121cc6fd174510db1ac371072c527f86558
user: "1000:1000"
@ -20,20 +21,17 @@ services:
PHOTOPRISM_ADMIN_PASSWORD: "${APP_PASSWORD}"
PHOTOPRISM_ORIGINALS_LIMIT: 10000
PHOTOPRISM_HTTP_COMPRESSION: "gzip"
PHOTOPRISM_HTTP_PORT: "${APP_PHOTOPRISM_PORT}"
PHOTOPRISM_HTTP_PORT: 8087
PHOTOPRISM_DATABASE_DRIVER: "mysql"
PHOTOPRISM_DATABASE_SERVER: "${APP_PHOTOPRISM_DB_IP}:3306"
PHOTOPRISM_DATABASE_SERVER: "photoprism_db_1:3306"
PHOTOPRISM_DATABASE_NAME: "photoprism"
PHOTOPRISM_DATABASE_USER: "photoprism"
PHOTOPRISM_DATABASE_PASSWORD: "photoprism"
PHOTOPRISM_SITE_URL: "http://${APP_DOMAIN}:${APP_PHOTOPRISM_PORT}/"
PHOTOPRISM_SITE_URL: "http://${APP_DOMAIN}:8087/"
PHOTOPRISM_SITE_TITLE: "PhotoPrism"
PHOTOPRISM_SITE_CAPTION: "Digital Asset Management"
PHOTOPRISM_SITE_DESCRIPTION: ""
PHOTOPRISM_SITE_AUTHOR: ""
networks:
default:
ipv4_address: ${APP_PHOTOPRISM_IP}
db:
image: mariadb:10.5.12@sha256:dfcba5641bdbfd7cbf5b07eeed707e6a3672f46823695a0d3aba2e49bbd9b1dd
@ -48,6 +46,3 @@ services:
MYSQL_DATABASE: "photoprism"
MYSQL_USER: "photoprism"
MYSQL_PASSWORD: "photoprism"
networks:
default:
ipv4_address: ${APP_PHOTOPRISM_DB_IP}

View File

@ -1,3 +0,0 @@
export APP_PHOTOPRISM_IP="10.21.21.42"
export APP_PHOTOPRISM_PORT="8087"
export APP_PHOTOPRISM_DB_IP="10.21.21.43"

View File

@ -3,9 +3,10 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_PI_HOLE_IP
APP_HOST: pi-hole_server_1
APP_PORT: 80
PROXY_AUTH_ADD: "false"
server:
image: pihole/pihole:2022.11.1@sha256:7ea4b00fcb3e4942b88015ddbb1fe9bbda95b692d8e56f1a13481356a1eb2707
# Pi-hole doesn't currently support running as non-root
@ -21,6 +22,3 @@ services:
environment:
- VIRTUAL_HOST=${APP_DOMAIN}
- WEBPASSWORD=${APP_PASSWORD}
networks:
default:
ipv4_address: $APP_PI_HOLE_IP

View File

@ -1,2 +0,0 @@
export APP_PI_HOLE_PORT="8082"
export APP_PI_HOLE_IP="10.21.21.36"

View File

@ -27,6 +27,3 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${APP_DATA_DIR}/data/transcode:/transcode
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
networks:
default:
ipv4_address: $APP_PLEX_IP

View File

@ -1,5 +1,3 @@
export APP_PLEX_IP="10.21.25.2"
# As Plex does not use the app proxy
# There is a bug when generating the Tor HS
# This 'fix' will create a fake HS hostname

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_PROWLARR_IP
APP_PORT: $APP_PROWLARR_PORT
APP_HOST: prowlarr_server_1
APP_PORT: 9696
PROXY_AUTH_WHITELIST: "/api/*"
server:
@ -16,9 +16,6 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
restart: on-failure
networks:
default:
ipv4_address: $APP_PROWLARR_IP
mac:
image: getumbrel/media-app-configurator:v1.1.0@sha256:987f6a02367adf86ab1cff38e1e2d43d85e17a6fc130aae4af196fb571dff06a

View File

@ -1,6 +1,3 @@
export APP_PROWLARR_IP="10.21.25.8"
export APP_PROWLARR_PORT=9696
export APP_PROWLARR_RADARR_CONFIG_XML=$(cat "${UMBREL_ROOT}/app-data/radarr/data/config/config.xml" 2>/dev/null || echo "")
export APP_PROWLARR_LIDARR_CONFIG_XML=$(cat "${UMBREL_ROOT}/app-data/lidarr/data/config/config.xml" 2>/dev/null || echo "")
export APP_PROWLARR_SONARR_CONFIG_XML=$(cat "${UMBREL_ROOT}/app-data/sonarr/data/config/config.xml" 2>/dev/null || echo "")

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_RADARR_IP
APP_PORT: $APP_RADARR_PORT
APP_HOST: radarr_server_1
APP_PORT: 7878
PROXY_AUTH_WHITELIST: "/api/*"
server:
@ -16,9 +16,6 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
restart: on-failure
networks:
default:
ipv4_address: $APP_RADARR_IP
mac:
image: getumbrel/media-app-configurator:v1.0.0@sha256:e3d8b18e0186f76dd3f3d4acacc9101b4abbf302d8f2afbb47cdd3879b1a1008
@ -28,8 +25,8 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
environment:
DOWNLOAD_CLIENT_API_URL: "http://${APP_RADARR_IP}:${APP_RADARR_PORT}/api/v3/downloadclient"
ROOT_FOLDER_API_URL: "http://${APP_RADARR_IP}:${APP_RADARR_PORT}/api/v3/rootfolder"
DOWNLOAD_CLIENT_API_URL: "http://radarr_server_1:7878/api/v3/downloadclient"
ROOT_FOLDER_API_URL: "http://radarr_server_1:7878/api/v3/rootfolder"
TRANSMISSION_HOST: "transmission_server_1"
TRANSMISSION_PORT: 9091
ROOT_FOLDER: "/downloads/movies"

View File

@ -1,2 +0,0 @@
export APP_RADARR_IP="10.21.25.5"
export APP_RADARR_PORT=7878

View File

@ -3,8 +3,9 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_RIDE_THE_LIGHTNING_IP
APP_PORT: $APP_RIDE_THE_LIGHTNING_PORT
APP_HOST: ride-the-lightning_web_1
APP_PORT: 3001
web:
image: shahanafarooqui/rtl:0.13.2@sha256:07d4c1f263c05c32270dcaab3625fc68ef985efce652e7850fbf57f65d36366f
user: "1000:1000"
@ -19,7 +20,7 @@ services:
environment:
# App config
APP_PASSWORD: $APP_PASSWORD
PORT: $APP_RIDE_THE_LIGHTNING_PORT
PORT: 3001
RTL_CONFIG_PATH: "/data"
CHANNEL_BACKUP_PATH: "/data/backup"
LN_IMPLEMENTATION: "LND"
@ -30,11 +31,8 @@ services:
CONFIG_PATH: "/lnd/lnd.conf"
# Boltz
BOLTZ_SERVER_URL: "https://$APP_RIDE_THE_LIGHTNING_BOLTZ_IP:9003"
BOLTZ_SERVER_URL: "https://ride-the-lightning_boltz_1:9003"
BOLTZ_MACAROON_PATH: "/boltz/.boltz-lnd/macaroons"
networks:
default:
ipv4_address: $APP_RIDE_THE_LIGHTNING_IP
boltz:
image: boltz/boltz-lnd:1.2.6@sha256:01a56dd357a2460bfd0ecdd726d6db3ab59d78ee691250831d09ba5de3fec7ce
@ -50,8 +48,5 @@ services:
- --lnd.host="$APP_LIGHTNING_NODE_IP"
- --lnd.macaroon="/lnd/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon"
- --lnd.certificate="/lnd/tls.cert"
- --rpc.rest.host="$APP_RIDE_THE_LIGHTNING_BOLTZ_IP"
- --rpc.rest.host="0.0.0.0"
- --rpc.rest.port="9003"
networks:
default:
ipv4_address: $APP_RIDE_THE_LIGHTNING_BOLTZ_IP

View File

@ -1,4 +0,0 @@
export APP_RIDE_THE_LIGHTNING_IP="10.21.21.15"
export APP_RIDE_THE_LIGHTNING_PORT="3001"
export APP_RIDE_THE_LIGHTNING_LOOP_IP="10.21.21.16" # Legacy
export APP_RIDE_THE_LIGHTNING_BOLTZ_IP="10.21.21.63"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: ${APP_ROBOSATS_IP}
APP_PORT: ${APP_ROBOSATS_PORT}
APP_HOST: robosats_web_1
APP_PORT: 12596
web:
image: recksato/robosats-client:v0.3.1-alpha@sha256:5056f6905a4f93c319def72a89bf05f33443f4c4b5f4dcd1232331996335cf9e
@ -15,6 +15,3 @@ services:
TOR_PROXY_IP: ${TOR_PROXY_IP}
TOR_PROXY_PORT: ${TOR_PROXY_PORT}
ROBOSATS_ONION: robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion
networks:
default:
ipv4_address: ${APP_ROBOSATS_IP}

View File

@ -1,2 +0,0 @@
export APP_ROBOSATS_IP="10.21.21.108"
export APP_ROBOSATS_PORT="12596"

View File

@ -3,9 +3,10 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SAMOURAI_SERVER_IP
APP_HOST: samourai-server_nginx_1
APP_PORT: 8081
PROXY_AUTH_ADD: "false"
db:
image: louneskmt/dojo-db:1.5.0-low-mem@sha256:5af4f90818d55360e572033fcc493cd945143e7a3aaef91fa7e102f3c66c7a5b
init: true
@ -19,15 +20,12 @@ services:
MYSQL_PASSWORD: password
volumes:
- ${APP_DATA_DIR}/mysql/data:/var/lib/mysql
networks:
default:
ipv4_address: $APP_SAMOURAI_SERVER_DB_IP
node:
image: louneskmt/dojo-nodejs:1.16.1@sha256:49de92774ecfcb88af1dc67f8d498641d750c4ec9acaab3c448d70c4f2d4bfe7
init: true
restart: on-failure
command: "/home/node/app/wait-for-it.sh ${APP_SAMOURAI_SERVER_DB_IP}:3306 --timeout=720 --strict -- /home/node/app/restart.sh"
command: "/home/node/app/wait-for-it.sh samourai-server_db_1:3306 --timeout=720 --strict -- /home/node/app/restart.sh"
user: "1000:1000"
environment:
# GLOBAL
@ -35,7 +33,7 @@ services:
DOJO_VERSION_TAG: 1.16.1
NET_DOJO_TOR_IPV4: $TOR_PROXY_IP
TOR_SOCKS_PORT: $TOR_PROXY_PORT
NET_DOJO_MYSQL_IPV4: $APP_SAMOURAI_SERVER_DB_IP
NET_DOJO_MYSQL_IPV4: samourai-server_db_1
# MYSQL
MYSQL_DATABASE: samourai-main
@ -84,9 +82,6 @@ services:
INDEXER_BATCH_SUPPORT: inactive # 'active' for ElectrumX, 'inactive' otherwise
depends_on:
- db
networks:
default:
ipv4_address: $APP_SAMOURAI_SERVER_NODE_IP
whirlpool:
image: louneskmt/whirlpool:0.10.15@sha256:3b766327dfa4c2ae40f190c18afa1f3c9cb9101d7964049dc79bdcb89fd21a90
@ -97,7 +92,7 @@ services:
- "--listen"
- "--cli.apiKey=$APP_SAMOURAI_SERVER_WHIRLPOOL_API_KEY"
- "--cli.api.http-enable=true"
- "--cli.api.http-port=$APP_SAMOURAI_SERVER_WHIRLPOOL_PORT"
- "--cli.api.http-port=8898"
- "--cli.tor=true"
- "--cli.torConfig.coordinator.enabled=true"
- "--cli.torConfig.coordinator.onion=true"
@ -109,14 +104,11 @@ services:
environment:
WHIRLPOOL_BITCOIN_NETWORK: $APP_BITCOIN_NETWORK
WHIRLPOOL_DOJO: "on"
WHIRLPOOL_DOJO_IP: $APP_SAMOURAI_SERVER_IP
WHIRLPOOL_DOJO_IP: "samourai-server_nginx_1"
depends_on:
- node
volumes:
- ${APP_DATA_DIR}/whirlpool:/home/whirlpool/.whirlpool-cli
networks:
default:
ipv4_address: $APP_SAMOURAI_SERVER_WHIRLPOOL_IP
nginx:
image: nginx:1.21-alpine@sha256:686aac2769fd6e7bab67663fd38750c135b72d993d0bb0a942ab02ef647fc9c3
@ -131,19 +123,16 @@ services:
- ${APP_DATA_DIR}/nginx/connect:/var/www/connect
environment:
COMMON_BTC_NETWORK: $APP_BITCOIN_NETWORK
DOJO_LOCAL_PORT: $APP_SAMOURAI_SERVER_DOJO_PORT
DOJO_LOCAL_PORT: 3009
DOJO_HIDDEN_SERVICE: $APP_SAMOURAI_SERVER_DOJO_HIDDEN_SERVICE
WHIRLPOOL_HIDDEN_SERVICE: $APP_SAMOURAI_SERVER_WHIRLPOOL_HIDDEN_SERVICE
NODE_PREFIX_SUPPORT: support
NODE_ADMIN_KEY: $APP_SAMOURAI_SERVER_NODE_ADMIN_KEY
WHIRLPOOL_API_KEY: $APP_SAMOURAI_SERVER_WHIRLPOOL_API_KEY
ports:
- "$APP_SAMOURAI_SERVER_DOJO_PORT:80"
- "3009:80"
depends_on:
- node
networks:
default:
ipv4_address: $APP_SAMOURAI_SERVER_IP
tor:
image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a

View File

@ -1,11 +1,3 @@
export APP_SAMOURAI_SERVER_IP="10.21.21.22"
export APP_SAMOURAI_SERVER_DOJO_PORT="3009"
export APP_SAMOURAI_SERVER_CONNECT_PORT="3005"
export APP_SAMOURAI_SERVER_WHIRLPOOL_IP="10.21.21.23"
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="${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 APP_SAMOURAI_SERVER_DOJO_HIDDEN_SERVICE="$(cat "${dojo_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")"

View File

@ -1,7 +1,3 @@
# samourai-server dojo Hidden Service
HiddenServiceDir /data/app-$APP_ID-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
HiddenServicePort 80 samourai-server_whirlpool_1:8898

View File

@ -3,10 +3,11 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SATSALE_IP
APP_HOST: satsale_web_1
APP_PORT: 5000
PROXY_AUTH_ADD: "false"
satsale:
web:
image: satsale/satsale:0.1.13@sha256:98380ad6c5166d83e627c4d1f4efdbcfd5b9217096f7fb26b287fda89eebccbb
restart: on-failure
stop_grace_period: 1m
@ -22,6 +23,3 @@ services:
MACAROON_FILE: /lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/invoice.macaroon
TLS_FILE: /lnd/tls.cert
APP_PASSWORD: $APP_PASSWORD
networks:
default:
ipv4_address: $APP_SATSALE_IP

View File

@ -1,2 +0,0 @@
export APP_SATSALE_PORT="5000"
export APP_SATSALE_IP="10.21.21.67"

View File

@ -3,20 +3,17 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SIMPLE_TORRENT_IP
APP_PORT: $APP_SIMPLE_TORRENT_PORT
APP_HOST: simple-torrent_server_1
APP_PORT: 8086
server:
image: boypt/cloud-torrent:1.3.9@sha256:90cc62869ebaabbdba31535cdff4c66ede98b341956d2ebcd6650610a37e9819
user: "1000:1000"
restart: on-failure
command: >
--port=${APP_SIMPLE_TORRENT_PORT}
--port=8086
--config-path /config/simple-torrent.json
volumes:
- ${APP_DATA_DIR}/data/torrents:/torrents
- ${APP_DATA_DIR}/data/downloads:/downloads
- ${APP_DATA_DIR}/data/config:/config
networks:
default:
ipv4_address: $APP_SIMPLE_TORRENT_IP

View File

@ -1,2 +0,0 @@
export APP_SIMPLE_TORRENT_IP="10.21.21.41"
export APP_SIMPLE_TORRENT_PORT="8086"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SNOWFLAKE_IP
APP_PORT: $APP_SNOWFLAKE_PORT
APP_HOST: snowflake_web_1
APP_PORT: 3800
proxy:
image: getumbrel/snowflake:v2.1.0@sha256:875a513540a132752a4b09f5d6de4ed41399c5331265d6576dcfb5952bb22053
@ -13,17 +13,11 @@ services:
command: "-log /data/snowflake.log -verbose"
volumes:
- ${APP_DATA_DIR}/data:/data
networks:
default:
ipv4_address: $APP_SNOWFLAKE_PROXY_IP
web:
image: getumbrel/gotty:v1.0.1@sha256:100571d271cfbae25603acac216afce511eece9961218c6db427e0fa4a58716a
restart: on-failure
stop_grace_period: 1m
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"'
command: --port 3800 --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
networks:
default:
ipv4_address: $APP_SNOWFLAKE_IP

View File

@ -1,3 +0,0 @@
export APP_SNOWFLAKE_IP="10.21.21.82"
export APP_SNOWFLAKE_PORT="3800"
export APP_SNOWFLAKE_PROXY_IP="10.21.21.83"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SONARR_IP
APP_PORT: $APP_SONARR_PORT
APP_HOST: sonarr_server_1
APP_PORT: 8989
PROXY_AUTH_WHITELIST: "/api/*"
server:
@ -16,9 +16,6 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
restart: on-failure
networks:
default:
ipv4_address: $APP_SONARR_IP
mac:
image: getumbrel/media-app-configurator:v1.0.0@sha256:e3d8b18e0186f76dd3f3d4acacc9101b4abbf302d8f2afbb47cdd3879b1a1008
@ -28,8 +25,8 @@ services:
- ${APP_DATA_DIR}/data/config:/config
- ${UMBREL_ROOT}/data/storage/downloads:/downloads
environment:
DOWNLOAD_CLIENT_API_URL: "http://${APP_SONARR_IP}:${APP_SONARR_PORT}/api/v3/downloadclient"
ROOT_FOLDER_API_URL: "http://${APP_SONARR_IP}:${APP_SONARR_PORT}/api/v3/rootfolder"
DOWNLOAD_CLIENT_API_URL: "http://sonarr_server_1:8989/api/v3/downloadclient"
ROOT_FOLDER_API_URL: "http://sonarr_server_1:8989/api/v3/rootfolder"
TRANSMISSION_HOST: "transmission_server_1"
TRANSMISSION_PORT: 9091
ROOT_FOLDER: "/downloads/shows"

View File

@ -1,2 +0,0 @@
export APP_SONARR_IP="10.21.25.6"
export APP_SONARR_PORT=8989

View File

@ -3,9 +3,9 @@ version: "3.7"
services:
app_proxy:
environment:
PROXY_AUTH_ADD: "false"
APP_HOST: $APP_SPARKKIOSK_IP
APP_HOST: sparkkiosk_web_1
APP_PORT: 21214
PROXY_AUTH_ADD: "false"
web:
image: jensgertsen/sparkkiosk:v1.0.0@sha256:d49500ce9c47d04436e64dae7e336416aa32f83673058154aa8a983e1420008c
@ -17,9 +17,6 @@ services:
- ${APP_DATA_DIR}/data:/data
- ${APP_LIGHTNING_NODE_DATA_DIR}:/lnd:ro
environment:
# Global
# LND
LND_GRPC_ENDPOINT: $APP_LIGHTNING_NODE_IP
LND_GRPC_PORT: $APP_LIGHTNING_NODE_GRPC_PORT
@ -30,6 +27,3 @@ services:
APP_HIDDEN_SERVICE: http://$APP_HIDDEN_SERVICE
APP_PASSWORD: $APP_PASSWORD
APP_DOMAIN: $APP_DOMAIN
networks:
default:
ipv4_address: $APP_SPARKKIOSK_IP

View File

@ -1,2 +0,0 @@
export APP_SPARKKIOSK_IP="10.21.21.90"
export APP_SPARKKIOSK_PORT="21214"

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SPECTER_DESKTOP_IP
APP_PORT: $APP_SPECTER_DESKTOP_PORT
APP_HOST: specter-desktop_web_1
APP_PORT: 25441
web:
image: lncm/specter-desktop:v1.13.1@sha256:d277dec2a54fc77f3ccbc0f082183abce31e655b50f21da8d098f90fb734a15b
@ -23,6 +23,3 @@ services:
BTC_RPC_HOST: $APP_BITCOIN_NODE_IP
BTC_RPC_PORT: $APP_BITCOIN_RPC_PORT
BTC_RPC_PROTOCOL: http
networks:
default:
ipv4_address: $APP_SPECTER_DESKTOP_IP

View File

@ -1,2 +0,0 @@
export APP_SPECTER_DESKTOP_IP="10.21.21.18"
export APP_SPECTER_DESKTOP_PORT="25441"

View File

@ -3,12 +3,11 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SPHINX_RELAY_IP
APP_HOST: sphinx-relay_server_1
APP_PORT: $APP_SPHINX_RELAY_PORT
PROXY_AUTH_ADD: "false"
sphinx-relay:
container_name: sphinx-relay
server:
image: sphinxlightning/sphinx-relay:v2.2.12@sha256:96778f56fc3b2c7703ec6d0d3162a9fe4c82b0d57179819c90efc479cdc1620a
init: true
restart: on-failure
@ -24,6 +23,3 @@ services:
TLS_LOCATION: /lnd/tls.cert
MACAROON_LOCATION: /lnd/data/chain/bitcoin/${APP_BITCOIN_NETWORK}/admin.macaroon
LND_LOG_LOCATION: /lnd/logs/bitcoin/${APP_BITCOIN_NETWORK}/lnd.log
networks:
default:
ipv4_address: $APP_SPHINX_RELAY_IP

View File

@ -1,3 +1,2 @@
export APP_SPHINX_RELAY_IP="10.21.21.14"
export APP_SPHINX_RELAY_PORT="3300"
export APP_SPHINX_RELAY_TOR_HS_EXTRA_PORTS="${APP_SPHINX_RELAY_PORT}:${APP_SPHINX_RELAY_IP}:${APP_SPHINX_RELAY_PORT}"
export APP_SPHINX_RELAY_TOR_HS_EXTRA_PORTS="${APP_SPHINX_RELAY_PORT}:sphinx-relay_server_1:${APP_SPHINX_RELAY_PORT}"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SQUEAKNODE_IP
APP_HOST: squeaknode_web_1
APP_PORT: $APP_SQUEAKNODE_PORT
web:
@ -46,9 +46,6 @@ services:
SQUEAKNODE_SERVER_EXTERNAL_ADDRESS: $APP_SQUEAKNODE_P2P_HIDDEN_SERVICE
DEBUG: "squeaknode:*"
networks:
default:
ipv4_address: $APP_SQUEAKNODE_IP
tor:
image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a

View File

@ -1,4 +1,3 @@
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"

View File

@ -1,4 +1,4 @@
# squeaknode p2p Hidden Service
HiddenServiceDir /data/app-$APP_ID-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
HiddenServicePort $APP_SQUEAKNODE_P2P_PORT squeaknode_web_1:$APP_SQUEAKNODE_P2P_PORT
HiddenServicePort $APP_SQUEAKNODE_P2P_TESTNET_PORT squeaknode_web_1:$APP_SQUEAKNODE_P2P_TESTNET_PORT

View File

@ -3,8 +3,8 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SQUEAKROAD_IP
APP_PORT: $APP_SQUEAKROAD_PORT
APP_HOST: squeakroad_web_1
APP_PORT: 18200
PROXY_AUTH_ADD: "false"
web:
@ -16,7 +16,7 @@ services:
- $APP_LIGHTNING_NODE_DATA_DIR:/lnd-dir:ro
- ${APP_DATA_DIR}/data:/data
environment:
ROCKET_PORT: $APP_SQUEAKROAD_PORT
ROCKET_PORT: 18200
ROCKET_ADDRESS: 0.0.0.0
SQUEAKROAD_DB_URL: /data/db.sqlite
SQUEAKROAD_ADMIN_USERNAME: umbrel
@ -25,6 +25,3 @@ services:
SQUEAKROAD_LND_PORT: $APP_LIGHTNING_NODE_GRPC_PORT
SQUEAKROAD_LND_TLS_CERT_PATH: /lnd-dir/tls.cert
SQUEAKROAD_LND_MACAROON_PATH: /lnd-dir/data/chain/bitcoin/$APP_BITCOIN_NETWORK/admin.macaroon
networks:
default:
ipv4_address: $APP_SQUEAKROAD_IP

View File

@ -1,2 +0,0 @@
export APP_SQUEAKROAD_IP="10.21.21.99"
export APP_SQUEAKROAD_PORT="18200"

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SUREDBITS_WALLET_IP
APP_HOST: suredbits-wallet_web_1
APP_PORT: 3002
web:
@ -17,15 +17,12 @@ services:
environment:
LOG_PATH: "/log/"
BITCOIN_S_HOME: "/bitcoin-s/"
#MEMPOOL_API_URL: "http://umbrel.local:${APP_MEMPOOL_PORT}/api"
WALLET_SERVER_API_URL: "http://${APP_SUREDBITS_WALLET_SERVER_IP}:9999/"
WALLET_SERVER_WS: "ws://${APP_SUREDBITS_WALLET_SERVER_IP}:19999/events"
#MEMPOOL_API_URL: "http://umbrel.local:${APP_MEMPOOL_PORT}/api"
WALLET_SERVER_API_URL: "http://suredbits-wallet_walletserver_1:9999/"
WALLET_SERVER_WS: "ws://suredbits-wallet_walletserver_1:19999/events"
TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT}
DEFAULT_UI_PASSWORD: "none"
BITCOIN_S_SERVER_RPC_PASSWORD: $APP_PASSWORD
networks:
default:
ipv4_address: $APP_SUREDBITS_WALLET_IP
depends_on:
- walletserver
@ -55,9 +52,6 @@ services:
DISABLE_JLINK: "1"
ports:
- "$APP_SUREDBITS_WALLET_P2P_PORT:$APP_SUREDBITS_WALLET_P2P_PORT"
networks:
default:
ipv4_address: $APP_SUREDBITS_WALLET_SERVER_IP
tor:
image: getumbrel/tor:0.4.7.8@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a

View File

@ -1,6 +1,3 @@
export APP_SUREDBITS_WALLET_IP="10.21.21.73"
export APP_SUREDBITS_WALLET_PORT="3020"
export APP_SUREDBITS_WALLET_SERVER_IP="10.21.21.74"
export APP_SUREDBITS_WALLET_P2P_PORT="2862"
suredbits_wallet_p2p_hidden_service_file="${EXPORTS_TOR_DATA_DIR}/app-${EXPORTS_APP_ID}-p2p/hostname"

View File

@ -1,3 +1,3 @@
# 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
HiddenServicePort $APP_SUREDBITS_WALLET_P2P_PORT suredbits-wallet_walletserver_1:$APP_SUREDBITS_WALLET_P2P_PORT

View File

@ -3,7 +3,7 @@ version: "3.7"
services:
app_proxy:
environment:
APP_HOST: $APP_SYNAPSE_IP
APP_HOST: synapse_server_1
APP_PORT: $APP_SYNAPSE_PORT
PROXY_AUTH_ADD: "false"
@ -24,6 +24,3 @@ services:
SYNAPSE_REPORT_STATS: "yes"
SYNAPSE_ENABLE_REGISTRATION: "yes"
SYNAPSE_NO_TLS: "yes"
networks:
default:
ipv4_address: $APP_SYNAPSE_IP

View File

@ -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}"
export APP_SYNAPSE_TOR_HS_EXTRA_PORTS="${APP_SYNAPSE_PORT}:synapse_server_1:${APP_SYNAPSE_PORT}"

Some files were not shown because too many files have changed in this diff Show More