From d4a28881a2eebef9d183a76a3294b79a3255b1ad Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Sun, 7 Jul 2024 13:44:09 +0000 Subject: [PATCH 1/7] Update local.conf --- compose/nginx/mn.conf.d/local.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/compose/nginx/mn.conf.d/local.conf b/compose/nginx/mn.conf.d/local.conf index 0c14f91..c4bd962 100644 --- a/compose/nginx/mn.conf.d/local.conf +++ b/compose/nginx/mn.conf.d/local.conf @@ -41,6 +41,20 @@ server { limit_req zone=tenpersec burst=10; } + location /coordinator { + # Blocks admin access from the public onion address + if ($host ~* "robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion") { + return 403; # Forbidden + } + + proxy_pass http://robosats_gunicorn_rest; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; + # Replace with the onion hidden service of your coordinator + add_header Onion-Location https://robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion$request_uri; + + } location /ws/ { # websockets are passed to Daphne From 09f8dbb6872559de5fa0827fe8ee686f3a49d9f9 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Sun, 7 Jul 2024 13:47:10 +0000 Subject: [PATCH 2/7] Update local.conf --- compose/nginx/tn.conf.d/local.conf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/compose/nginx/tn.conf.d/local.conf b/compose/nginx/tn.conf.d/local.conf index aed3905..e2114db 100644 --- a/compose/nginx/tn.conf.d/local.conf +++ b/compose/nginx/tn.conf.d/local.conf @@ -40,6 +40,21 @@ server { limit_req zone=fivepersec burst=10; } + location /coordinator { + # Blocks admin access from the public onion address + if ($host ~* "robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion") { + return 403; # Forbidden + } + + proxy_pass http://robosats_gunicorn_rest; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $host; + proxy_redirect off; + # Replace with the onion hidden service of your coordinator + add_header Onion-Location https://robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion$request_uri; + + } + location /ws/ { # websockets are passed to Daphne proxy_pass http://robosats_daphne_websocket; From d3895dde8c023d0171b3e84815e8c19b38fd6c6f Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Sun, 7 Jul 2024 13:48:00 +0000 Subject: [PATCH 3/7] Update torrc --- compose/env-sample/lndtn/torrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compose/env-sample/lndtn/torrc b/compose/env-sample/lndtn/torrc index a0539c7..fda6663 100644 --- a/compose/env-sample/lndtn/torrc +++ b/compose/env-sample/lndtn/torrc @@ -17,6 +17,10 @@ HiddenServiceVersion 3 HiddenServicePort 80 127.0.0.1:80 # Robosats Admin Testnet Onion Service +HiddenServiceDir /var/lib/tor/robotest-admin/ +HiddenServiceVersion 3 +HiddenServicePort 80 127.0.0.1:80 + HiddenServiceDir /var/lib/tor/robotest-thunderhub/ HiddenServiceVersion 3 HiddenServicePort 80 127.0.0.1:3000 From 20d13a32660b6987c3c4903e72658ee6685f784c Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 11:09:00 +0000 Subject: [PATCH 4/7] Update docker-compose.yml --- compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 5126bc4..d50e866 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -152,7 +152,7 @@ services: # NETWORK: ${NETWORK} # volumes: # - ${DATABASE}:/running/database:ro - # - ${BITCOIN_DATA}:/running/bitcoin:ro + # - ${BITCOIN_CONF:?}:/running/bitcoin/bitcoin.conf:ro # - ${LND_DATA}:/running/lnd:ro # - ${LIT_DATA}:/running/lit:ro # - ${STATIC}:/running/static:ro From f93944d373b8b3ae8569b0f72f5cf34b913c49b0 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 13:15:22 +0000 Subject: [PATCH 5/7] Update Dockerfile --- compose/backup/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/backup/Dockerfile b/compose/backup/Dockerfile index 4950b17..3b1ed02 100644 --- a/compose/backup/Dockerfile +++ b/compose/backup/Dockerfile @@ -3,8 +3,8 @@ FROM debian:bullseye-slim RUN apt update RUN apt-get install rsync -y -WORKDIR /usr/src/backup.sh +WORKDIR /usr/src -COPY backup.sh /usr/src/backup.sh +COPY backup.sh /usr/src CMD ["bash","backup.sh"] From b1ca6ef5682d44756bdf3a342534c0bc7b520f19 Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 13:15:58 +0000 Subject: [PATCH 6/7] Update Dockerfile --- compose/backup/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/backup/Dockerfile b/compose/backup/Dockerfile index 3b1ed02..98d50ef 100644 --- a/compose/backup/Dockerfile +++ b/compose/backup/Dockerfile @@ -3,8 +3,8 @@ FROM debian:bullseye-slim RUN apt update RUN apt-get install rsync -y -WORKDIR /usr/src - COPY backup.sh /usr/src +WORKDIR /usr/src + CMD ["bash","backup.sh"] From 8d5e24596dbe7176cac16df852e10254532e56fa Mon Sep 17 00:00:00 2001 From: KoalaSat Date: Fri, 26 Jul 2024 13:21:32 +0000 Subject: [PATCH 7/7] Update docker-compose.yml --- compose/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index d50e866..94a26ec 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -154,6 +154,7 @@ services: # - ${DATABASE}:/running/database:ro # - ${BITCOIN_CONF:?}:/running/bitcoin/bitcoin.conf:ro # - ${LND_DATA}:/running/lnd:ro + # - ${LND_CONF}:/running/lnd/lnd.conf:ro # - ${LIT_DATA}:/running/lit:ro # - ${STATIC}:/running/static:ro # - ${BU_DIR1}:/backup1