Merge pull request #30 from KoalaSat/split-strfry-onions

Split strfry onions

compose/docker-compose.yml

@@ -148,7 +148,8 @@ services:
     container_name: strfry${SUFFIX}
     restart: always
     volumes:
-      - ${STRFRY_URLS}:/app/onion_urls.txt:ro
+      - ${STRFRY_URLS_EXTERNAL}:/app/external_urls.txt:ro
+      - ${STRFRY_URLS_FEDERATION}:/app/federation_urls.txt:ro
       - ${STRFRY_CONF}:/etc/strfry.conf:ro
       - ${STRFRY_DATA}/db:/app/strfry-db:rw
     network_mode: service:tor

compose/env-sample/lndtn/compose.env

@@ -29,7 +29,8 @@ NGINX_CONFD='./nginx/tn.conf.d'
 WELLKNOWN='./nginx/tn.well-known'
 
 STRFRY_CONF='./env-sample/lndtn/strfry.conf'
-STRFRY_URLS='./strfry/tn.onion_urls.txt'
+STRFRY_URLS_EXTERNAL='./strfry/tn.external_urls.txt'
+STRFRY_URLS_FEDERATION='./strfry/tn.federation_urls.txt'
 STRFRY_DATA='/custom_path/testnet/strfry'
 
 # Port and number of HTTP server workers for the robosats backend

compose/strfry/mn.external_urls.txt

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

compose/strfry/mn.federation_urls.txt

@@ -1,5 +1,4 @@
 ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr
-ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr
 ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr
 ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr
 ws://otmoonrndnrddqdlhu6b36heunmbyw3cgvadqo2oqeau3656wfv7fwad.onion/nostr

compose/strfry/sync.sh

@@ -1,7 +1,15 @@
 #!/bin/sh
 
-filters='{"kinds":[38383, 31986, 1059]}'
+filters_federation='{"kinds":[38383, 31986, 1059]}'
+timeout_duration="15s"
 
 while IFS= read -r line; do
-  /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters" --dir both
-done < /app/onion_urls.txt
+  timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_federation" --dir both
+done < /app/federation_urls.txt
+
+
+filters_external='{"kinds":[38383]}'
+
+while IFS= read -r line; do
+  timeout "$timeout_duration" /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters_external" --dir both
+done < /app/external_urls.txt

compose/strfry/tn.external_urls.txt

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

compose/strfry/tn.federation_urls.txt

@@ -1,4 +1,3 @@
-ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr
 ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr
 ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr
 ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr