diff --git a/compose/docker-compose.override-lnd.yml b/compose/docker-compose.override-lnd.yml index f3c08da..33e0266 100644 --- a/compose/docker-compose.override-lnd.yml +++ b/compose/docker-compose.override-lnd.yml @@ -64,10 +64,10 @@ services: network_mode: service:tor # Patch common services - tor: - ports: - - ${THUB_LOCAL_PORT}:3000 - - ${LIT_LOCAL_PORT}:8443 +# tor: + # ports: + # - ${THUB_LOCAL_PORT}:3000 + # - ${LIT_LOCAL_PORT}:8443 robosats: volumes: - ${LND_DATA}:/lnd @@ -80,10 +80,10 @@ services: celery: volumes: - ${LND_DATA}:/lnd - # backup: - # volumes: - # - ${LND_DATA}:/running/lnd:ro - # - ${LIT_DATA}:/running/lit:ro + backup: + volumes: + - ${LND_DATA}:/running/lnd:ro + - ${LIT_DATA}:/running/lit:ro # Other LND services you might want to enable @@ -118,4 +118,4 @@ services: # container_name: deunhealth${SUFFIX} # restart: always # volumes: -# - /var/run/docker.sock:/var/run/docker.sock \ No newline at end of file +# - /var/run/docker.sock:/var/run/docker.sock diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 70589cf..6a2bb8a 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -9,10 +9,10 @@ services: volumes: - ${TOR_DATA:?}:/var/lib/tor - ${TOR_CONFIG:?}:/etc/tor/torrc - ports: - - ${WEB_LOCAL_PORT}:80 - - ${THUB_LOCAL_PORT}:3000 - - ${LIT_LOCAL_PORT}:8443 + # ports: + # - ${WEB_LOCAL_PORT}:80 + # - ${THUB_LOCAL_PORT}:3000 + # - ${LIT_LOCAL_PORT}:8443 bitcoind: image: ruimarinho/bitcoin-core:${BITCOIND_TAG:-24.0.1-alpine@sha256:624b6fb1c282a3db6438ff35fbb9eed6ae260c66ffbb427ae72edd7da6a0ecdc} @@ -170,22 +170,22 @@ services: network_mode: service:tor # Example simple backup service (copy/paste to attached storage locations) - # backup: - # build: ./backup - # container_name: bu${SUFFIX} - # restart: always - # environment: - # NETWORK: ${NETWORK} - # volumes: - # - ${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 - # - ${BU_DIR2}:/backup2 - # - ${BU_DIR3}:/backup3 - + backup: + build: ./backup + container_name: bu${SUFFIX} + restart: always + environment: + NETWORK: ${NETWORK} + volumes: + - ${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:rw + - ${BU_DIR2}:/backup2:rw + - ${BU_DIR3}:/backup3:rw + volumes: redisdata: diff --git a/compose/nginx/mn.conf.d/local.conf b/compose/nginx/mn.conf.d/local.conf index f45b779..807b630 100644 --- a/compose/nginx/mn.conf.d/local.conf +++ b/compose/nginx/mn.conf.d/local.conf @@ -14,13 +14,6 @@ upstream robosats_daphne_websocket { 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 { default 0; "~*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_redirect off; # 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; } @@ -57,9 +50,6 @@ server { # Denies any access by default set $allow_access 0; - if ($allowed_localIP = 1) { - set $allow_access 1; # Allows access for local IPs - } if ($allowed_onion = 1) { set $allow_access 1; # Allows access for your coordinator onion address } @@ -73,10 +63,9 @@ server { 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; - + add_header Onion-Location https://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion$request_uri; } - + location /ws/ { # websockets are passed to Daphne proxy_pass http://robosats_daphne_websocket; diff --git a/compose/nginx/tn.conf.d/local.conf b/compose/nginx/tn.conf.d/local.conf index dd161c4..88050f7 100644 --- a/compose/nginx/tn.conf.d/local.conf +++ b/compose/nginx/tn.conf.d/local.conf @@ -14,23 +14,16 @@ upstream robosats_daphne_websocket { 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 { 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 server { listen 80; - server_name testnet.robosats.com; + server_name satstralia.com; large_client_header_buffers 4 64k; location /static { @@ -48,7 +41,7 @@ server { proxy_set_header Host $host; proxy_redirect off; # 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; } @@ -56,9 +49,6 @@ server { # Denies any access by default set $allow_access 0; - if ($allowed_localIP = 1) { - set $allow_access 1; # Allows access for local IPs - } if ($allowed_onion = 1) { set $allow_access 1; # Allows access for your coordinator onion address } @@ -72,7 +62,7 @@ server { 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; + add_header Onion-Location https://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion$request_uri; } diff --git a/compose/strfry/mn.external_urls.txt b/compose/strfry/mn.external_urls.txt index bec28c1..c077b42 100644 --- a/compose/strfry/mn.external_urls.txt +++ b/compose/strfry/mn.external_urls.txt @@ -1,4 +1,3 @@ wss://nostr.satstralia.com wss://relay.damus.io -wss://nostrvista.aaroniumii.com -wss://freelay.sovbit.host +wss://freelay.sovbit.host \ No newline at end of file diff --git a/compose/strfry/tn.external_urls.txt b/compose/strfry/tn.external_urls.txt index e79f29e..c077b42 100644 --- a/compose/strfry/tn.external_urls.txt +++ b/compose/strfry/tn.external_urls.txt @@ -1,3 +1,3 @@ wss://nostr.satstralia.com wss://relay.damus.io -wss://freelay.sovbit.host +wss://freelay.sovbit.host \ No newline at end of file