From ad66d58ad6f127cd6b346589f894f6627a66ce1a Mon Sep 17 00:00:00 2001
From: pyr0ball <pyroballpcs@gmail.com>
Date: Wed, 13 May 2026 05:17:43 -0700
Subject: [PATCH] fix: run collect service as alan user; call ingest directly
 without Docker

---
 scripts/collect_cluster_logs.sh           |  9 ++++++---
 scripts/turnstone-cluster-collect.service |  1 +
 scripts/turnstone-cluster.service         | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 scripts/turnstone-cluster.service

diff --git a/scripts/collect_cluster_logs.sh b/scripts/collect_cluster_logs.sh
index d3f3edd..940f187 100644
--- a/scripts/collect_cluster_logs.sh
+++ b/scripts/collect_cluster_logs.sh
@@ -42,9 +42,12 @@ for node in "${!NODES[@]}"; do
   fi
 done
 
-# Trigger ingest of remote node journals into the running container.
-docker exec turnstone-cluster python scripts/ingest_corpus.py \
-  --sources /patterns/sources-cluster.yaml --db /data/turnstone.db \
+# Ingest remote node journals directly via the cf Python environment.
+TURNSTONE_DB=/devl/turnstone-cluster/data/turnstone.db \
+  /devl/miniconda3/envs/cf/bin/python \
+  /Library/Development/CircuitForge/turnstone/scripts/ingest_corpus.py \
+  --sources /devl/turnstone-cluster/patterns/sources-cluster.yaml \
+  --db /devl/turnstone-cluster/data/turnstone.db \
   >> /var/log/turnstone-cluster-ingest.log 2>&1
 
 echo "collect_cluster_logs: done"
diff --git a/scripts/turnstone-cluster-collect.service b/scripts/turnstone-cluster-collect.service
index 74ac355..0b1a1cc 100644
--- a/scripts/turnstone-cluster-collect.service
+++ b/scripts/turnstone-cluster-collect.service
@@ -4,6 +4,7 @@ After=network.target
 
 [Service]
 Type=oneshot
+User=alan
 ExecStart=/bin/bash /Library/Development/CircuitForge/turnstone/scripts/collect_cluster_logs.sh
 StandardOutput=journal
 StandardError=journal
diff --git a/scripts/turnstone-cluster.service b/scripts/turnstone-cluster.service
new file mode 100644
index 0000000..a2891ab
--- /dev/null
+++ b/scripts/turnstone-cluster.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Turnstone cluster log monitor
+Documentation=https://git.opensourcesolarpunk.com/Circuit-Forge/turnstone
+After=network.target docker.service
+
+[Service]
+Type=simple
+WorkingDirectory=/Library/Development/CircuitForge/turnstone
+Environment=TURNSTONE_DB=/devl/turnstone-cluster/data/turnstone.db
+Environment=TURNSTONE_PATTERNS=/devl/turnstone-cluster/patterns
+Environment=TURNSTONE_SOURCE_HOST=heimdall-cluster
+ExecStart=/devl/miniconda3/envs/cf/bin/python -m uvicorn app.rest:app \
+    --host 0.0.0.0 --port 8534
+Restart=on-failure
+RestartSec=5s
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier=turnstone-cluster
+
+[Install]
+WantedBy=multi-user.target