Merge branch 'main' into main

This commit is contained in:
KoalaSat
2025-05-09 09:03:33 +00:00
committed by GitHub
6 changed files with 39 additions and 61 deletions

View File

@ -64,10 +64,10 @@ services:
network_mode: service:tor network_mode: service:tor
# Patch common services # Patch common services
tor: # tor:
ports: # ports:
- ${THUB_LOCAL_PORT}:3000 # - ${THUB_LOCAL_PORT}:3000
- ${LIT_LOCAL_PORT}:8443 # - ${LIT_LOCAL_PORT}:8443
robosats: robosats:
volumes: volumes:
- ${LND_DATA}:/lnd - ${LND_DATA}:/lnd
@ -80,10 +80,10 @@ services:
celery: celery:
volumes: volumes:
- ${LND_DATA}:/lnd - ${LND_DATA}:/lnd
# backup: backup:
# volumes: volumes:
# - ${LND_DATA}:/running/lnd:ro - ${LND_DATA}:/running/lnd:ro
# - ${LIT_DATA}:/running/lit:ro - ${LIT_DATA}:/running/lit:ro
# Other LND services you might want to enable # Other LND services you might want to enable
@ -118,4 +118,4 @@ services:
# container_name: deunhealth${SUFFIX} # container_name: deunhealth${SUFFIX}
# restart: always # restart: always
# volumes: # volumes:
# - /var/run/docker.sock:/var/run/docker.sock # - /var/run/docker.sock:/var/run/docker.sock

View File

@ -9,10 +9,10 @@ services:
volumes: volumes:
- ${TOR_DATA:?}:/var/lib/tor - ${TOR_DATA:?}:/var/lib/tor
- ${TOR_CONFIG:?}:/etc/tor/torrc - ${TOR_CONFIG:?}:/etc/tor/torrc
ports: # ports:
- ${WEB_LOCAL_PORT}:80 # - ${WEB_LOCAL_PORT}:80
- ${THUB_LOCAL_PORT}:3000 # - ${THUB_LOCAL_PORT}:3000
- ${LIT_LOCAL_PORT}:8443 # - ${LIT_LOCAL_PORT}:8443
bitcoind: bitcoind:
image: ruimarinho/bitcoin-core:${BITCOIND_TAG:-24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc} image: ruimarinho/bitcoin-core:${BITCOIND_TAG:-24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc}
@ -170,22 +170,22 @@ services:
network_mode: service:tor network_mode: service:tor
# Example simple backup service (copy/paste to attached storage locations) # Example simple backup service (copy/paste to attached storage locations)
# backup: backup:
# build: ./backup build: ./backup
# container_name: bu${SUFFIX} container_name: bu${SUFFIX}
# restart: always restart: always
# environment: environment:
# NETWORK: ${NETWORK} NETWORK: ${NETWORK}
# volumes: volumes:
# - ${DATABASE}:/running/database:ro - ${DATABASE}:/running/database:ro
# - ${BITCOIN_CONF:?}:/running/bitcoin/bitcoin.conf:ro - ${BITCOIN_CONF:?}:/running/bitcoin/bitcoin.conf:ro
# - ${LND_DATA}:/running/lnd:ro - ${LND_DATA}:/running/lnd:ro
# - ${LND_CONF}:/running/lnd/lnd.conf:ro - ${LND_CONF}:/running/lnd/lnd.conf:ro
# - ${LIT_DATA}:/running/lit:ro - ${LIT_DATA}:/running/lit:ro
# - ${STATIC}:/running/static:ro - ${STATIC}:/running/static:ro
# - ${BU_DIR1}:/backup1 - ${BU_DIR1}:/backup1:rw
# - ${BU_DIR2}:/backup2 - ${BU_DIR2}:/backup2:rw
# - ${BU_DIR3}:/backup3 - ${BU_DIR3}:/backup3:rw
volumes: volumes:
redisdata: redisdata:

View File

@ -14,13 +14,6 @@ upstream robosats_daphne_websocket {
server localhost:9000; server localhost:9000;
} }
# Define a variable for allowed IPs
geo $allowed_localIP {
default 0;
192.168.0.0/16 1; # Allows access for IPs in the range 192.168.0.0/16 (192.168.0.0 ~ 192.168.255.255)
#192.168.x.x 1; # or use your local IP for more security and remove the above line
}
map $host $allowed_onion { map $host $allowed_onion {
default 0; default 0;
"~*your-robotest-admin-onion-address\.onion" 1; # Allows access for your coordinator onion address "~*your-robotest-admin-onion-address\.onion" 1; # Allows access for your coordinator onion address
@ -49,7 +42,7 @@ server {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_redirect off; proxy_redirect off;
# Replace with the onion hidden service of your coordinator # Replace with the onion hidden service of your coordinator
add_header Onion-Location http://robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion$request_uri; add_header Onion-Location http://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion$request_uri;
limit_req zone=tenpersec burst=10; limit_req zone=tenpersec burst=10;
} }
@ -57,9 +50,6 @@ server {
# Denies any access by default # Denies any access by default
set $allow_access 0; set $allow_access 0;
if ($allowed_localIP = 1) {
set $allow_access 1; # Allows access for local IPs
}
if ($allowed_onion = 1) { if ($allowed_onion = 1) {
set $allow_access 1; # Allows access for your coordinator onion address set $allow_access 1; # Allows access for your coordinator onion address
} }
@ -73,10 +63,9 @@ server {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_redirect off; proxy_redirect off;
# Replace with the onion hidden service of your coordinator # Replace with the onion hidden service of your coordinator
add_header Onion-Location https://robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion$request_uri; add_header Onion-Location https://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion$request_uri;
} }
location /ws/ { location /ws/ {
# websockets are passed to Daphne # websockets are passed to Daphne
proxy_pass http://robosats_daphne_websocket; proxy_pass http://robosats_daphne_websocket;

View File

@ -14,23 +14,16 @@ upstream robosats_daphne_websocket {
server localhost:9000; server localhost:9000;
} }
# Define a variable for allowed IPs
geo $allowed_localIP {
default 0;
192.168.0.0/16 1; # Allows access for IPs in the range 192.168.0.0/16 (192.168.0.0 ~ 192.168.255.255)
#192.168.x.x 1; # or use your local IP for more security and remove the above line
}
map $host $allowed_onion { map $host $allowed_onion {
default 0; default 0;
"~*your-robotest-admin-onion-address\.onion" 1; # Allows access for your coordinator onion address "~*testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd\.onion" 1; # Allows access for your coordinator onion address
} }
# now we declare our main server # now we declare our main server
server { server {
listen 80; listen 80;
server_name testnet.robosats.com; server_name satstralia.com;
large_client_header_buffers 4 64k; large_client_header_buffers 4 64k;
location /static { location /static {
@ -48,7 +41,7 @@ server {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_redirect off; proxy_redirect off;
# Replace with the onion hidden service of your coordinator # Replace with the onion hidden service of your coordinator
add_header Onion-Location http://robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion$request_uri; add_header Onion-Location https://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion$request_uri;
limit_req zone=fivepersec burst=10; limit_req zone=fivepersec burst=10;
} }
@ -56,9 +49,6 @@ server {
# Denies any access by default # Denies any access by default
set $allow_access 0; set $allow_access 0;
if ($allowed_localIP = 1) {
set $allow_access 1; # Allows access for local IPs
}
if ($allowed_onion = 1) { if ($allowed_onion = 1) {
set $allow_access 1; # Allows access for your coordinator onion address set $allow_access 1; # Allows access for your coordinator onion address
} }
@ -72,7 +62,7 @@ server {
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_redirect off; proxy_redirect off;
# Replace with the onion hidden service of your coordinator # Replace with the onion hidden service of your coordinator
add_header Onion-Location https://robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion$request_uri; add_header Onion-Location https://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion$request_uri;
} }

View File

@ -1,4 +1,3 @@
wss://nostr.satstralia.com wss://nostr.satstralia.com
wss://relay.damus.io wss://relay.damus.io
wss://nostrvista.aaroniumii.com wss://freelay.sovbit.host
wss://freelay.sovbit.host

View File

@ -1,3 +1,3 @@
wss://nostr.satstralia.com wss://nostr.satstralia.com
wss://relay.damus.io wss://relay.damus.io
wss://freelay.sovbit.host wss://freelay.sovbit.host