From 0679ae9c7b7b2db720852e6870b6def514ee4058 Mon Sep 17 00:00:00 2001
From: koalasat <koalasat@satstralia.com>
Date: Sat, 3 May 2025 16:10:33 +0200
Subject: [PATCH] Split strfry onions

---
 compose/docker-compose.yml                               | 3 ++-
 compose/env-sample/lndtn/compose.env                     | 2 +-
 compose/strfry/mn.external_urls.txt                      | 5 +++++
 .../{mn.onion_urls.txt => mn.federation_urls .txt}       | 1 -
 compose/strfry/sync.sh                                   | 9 ++++++++-
 .../strfry/{tn.onion_urls.txt => tn.federation_urls.txt} | 1 -
 6 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 compose/strfry/mn.external_urls.txt
 rename compose/strfry/{mn.onion_urls.txt => mn.federation_urls .txt} (80%)
 rename compose/strfry/{tn.onion_urls.txt => tn.federation_urls.txt} (80%)

diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 3e446d3..546986f 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -148,7 +148,8 @@ services:
     container_name: strfry${SUFFIX}
     restart: always
     volumes:
-      - ${STRFRY_URLS}:/app/onion_urls.txt:ro
+      - ${STRFRY_URL_FILE}/external_urls.txt:/app/external_urls.txt:ro
+      - ${STRFRY_URL_FILE}/federation_urls.txt:/app/federation_urls.txt:ro
       - ${STRFRY_CONF}:/etc/strfry.conf:ro
       - ${STRFRY_DATA}/db:/app/strfry-db:rw
     network_mode: service:tor
diff --git a/compose/env-sample/lndtn/compose.env b/compose/env-sample/lndtn/compose.env
index 46a2b5e..3ed1431 100644
--- a/compose/env-sample/lndtn/compose.env
+++ b/compose/env-sample/lndtn/compose.env
@@ -29,7 +29,7 @@ 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_URL_FILE='./strfry/'
 STRFRY_DATA='/custom_path/testnet/strfry'
 
 # Port and number of HTTP server workers for the robosats backend
diff --git a/compose/strfry/mn.external_urls.txt b/compose/strfry/mn.external_urls.txt
new file mode 100644
index 0000000..1a6b634
--- /dev/null
+++ b/compose/strfry/mn.external_urls.txt
@@ -0,0 +1,5 @@
+wss://nostr.satstralia.com
+wss://freelay.sovbit.host
+wss://nostrvista.aaroniumii.com
+wss://relay.damus.io
+wss://relay.mostro.network
\ No newline at end of file
diff --git a/compose/strfry/mn.onion_urls.txt b/compose/strfry/mn.federation_urls .txt
similarity index 80%
rename from compose/strfry/mn.onion_urls.txt
rename to compose/strfry/mn.federation_urls .txt
index 5cc84c2..64b1eaf 100644
--- a/compose/strfry/mn.onion_urls.txt
+++ b/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
diff --git a/compose/strfry/sync.sh b/compose/strfry/sync.sh
index 1258d45..377054b 100644
--- a/compose/strfry/sync.sh
+++ b/compose/strfry/sync.sh
@@ -1,7 +1,14 @@
 #!/bin/sh
 
+filters='{"kinds":[38383]}'
+
+while IFS= read -r line; do
+  /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters" --dir both
+done < /app/external_urls.txt
+
+
 filters='{"kinds":[38383, 31986, 1059]}'
 
 while IFS= read -r line; do
   /app/strfry --config /etc/strfry.conf sync ${line} --filter "$filters" --dir both
-done < /app/onion_urls.txt
+done < /app/federation_urls.txt
diff --git a/compose/strfry/tn.onion_urls.txt b/compose/strfry/tn.federation_urls.txt
similarity index 80%
rename from compose/strfry/tn.onion_urls.txt
rename to compose/strfry/tn.federation_urls.txt
index 80fc12b..e9ac37f 100644
--- a/compose/strfry/tn.onion_urls.txt
+++ b/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