diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 6cdbd5f..0b2e05e 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -151,7 +151,6 @@ services: - ${STRFRY_SYNC}:/app/sync.sh:ro - ${STRFRY_CONF}:/etc/strfry.conf:ro - ${STRFRY_DATA}/db:/app/strfry-db:rw - - ${STRFRY_DATA}/log/:/var/log:rw network_mode: service:tor # Example simple backup service (copy/paste to attached storage locations) diff --git a/compose/strfry/Dockerfile b/compose/strfry/Dockerfile index c7c606a..578d0f5 100644 --- a/compose/strfry/Dockerfile +++ b/compose/strfry/Dockerfile @@ -1,11 +1,14 @@ FROM dockurr/strfry:0.9.6 -RUN apk add --no-cache dcron torsocks +RUN apk add --no-cache torsocks RUN echo "TorAddress 127.0.0.1" >> /etc/tor/torsocks.conf RUN echo "TorPort 9050" >> /etc/tor/torsocks.conf -COPY crontab /app/crontab +# Setting up crontab +COPY crontab /tmp/crontab +RUN cat /tmp/crontab > /etc/crontabs/root + COPY entrypoint.sh /etc/strfry/entrypoint.sh RUN chmod +x /etc/strfry/entrypoint.sh diff --git a/compose/strfry/entrypoint.sh b/compose/strfry/entrypoint.sh index b949e23..2ebe6b3 100644 --- a/compose/strfry/entrypoint.sh +++ b/compose/strfry/entrypoint.sh @@ -1,5 +1,3 @@ #!/bin/sh -crontab /app/crontab - crond -f -l 8 & /app/strfry.sh diff --git a/compose/strfry/mn.sync.sh b/compose/strfry/mn.sync.sh index debbd26..2828f5c 100644 --- a/compose/strfry/mn.sync.sh +++ b/compose/strfry/mn.sync.sh @@ -2,7 +2,7 @@ filters='{"kinds":[38383]}' -/app/strfry --config /etc/strfry.conf sync ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 -/app/strfry --config /etc/strfry.conf sync ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 -/app/strfry --config /etc/strfry.conf sync ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 -/app/strfry --config /etc/strfry.conf sync ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 +/app/strfry --config /etc/strfry.conf sync ws://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion/nostr --filter "$filters" --dir both +/app/strfry --config /etc/strfry.conf sync ws://satstraoq35jffvkgpfoqld32nzw2siuvowanruindbfojowpwsjdgad.onion/nostr --filter "$filters" --dir both +/app/strfry --config /etc/strfry.conf sync ws://4t4jxmivv6uqej6xzx2jx3fxh75gtt65v3szjoqmc4ugdlhipzdat6yd.onion/nostr --filter "$filters" --dir both +/app/strfry --config /etc/strfry.conf sync ws://mmhaqzuirth5rx7gl24d4773lknltjhik57k7ahec5iefktezv4b3uid.onion/nostr --filter "$filters" --dir both diff --git a/compose/strfry/tn.sync.sh b/compose/strfry/tn.sync.sh index 85634e2..d79feb2 100644 --- a/compose/strfry/tn.sync.sh +++ b/compose/strfry/tn.sync.sh @@ -2,7 +2,7 @@ filters='{"kinds":[38383]}' -/app/strfry --config /etc/strfry.conf sync ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 -/app/strfry --config /etc/strfry.conf sync ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 -/app/strfry --config /etc/strfry.conf sync ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 -/app/strfry --config /etc/strfry.conf sync ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr --filter "$filters" --dir both >> /var/log/cron.log 2>&1 +/app/strfry --config /etc/strfry.conf sync ws://testraliar7xkhos2gipv2k65obykofb4jqzl5l4danfryacifi4t7qd.onion/nostr --filter "$filters" --dir both +/app/strfry --config /etc/strfry.conf sync ws://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion/nostr --filter "$filters" --dir both +/app/strfry --config /etc/strfry.conf sync ws://ghbtv7lhoyhomyir4xvxaeyqgx4ylxksia343jaat3njqqlkqpdjqcyd.onion/nostr --filter "$filters" --dir both +/app/strfry --config /etc/strfry.conf sync ws://wsjyhbashc4zrrex6vijpryujggbka5plry2o62dxqoz3pxinblnj4ad.onion/nostr --filter "$filters" --dir both