From 9e4fba591a98bf8a9f231f75cb7d835f9bdd4b4b Mon Sep 17 00:00:00 2001
From: Justin Oros <JustinOros@gmail.com>
Date: Sat, 18 Apr 2026 21:08:22 -0700
Subject: [PATCH] compose.yaml, setup-spoke.sh: scope syncthing mount to data
 directory only, move config/certs to named Docker volume, syncthing.sh:
 update add folder path example

---
 spoke/compose.yaml   | 6 +++++-
 spoke/setup-spoke.sh | 4 ++--
 syncthing.sh         | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/spoke/compose.yaml b/spoke/compose.yaml
index 8113022..f18d17c 100644
--- a/spoke/compose.yaml
+++ b/spoke/compose.yaml
@@ -28,4 +28,8 @@ services:
       - "127.0.0.1:8384:8384"
       - "22000:22000"
     volumes:
-      - /home/armbian/st:/var/syncthing
+      - syncthing-config:/var/syncthing/config
+      - /home/armbian/st/data:/var/syncthing/data
+
+volumes:
+  syncthing-config:
diff --git a/spoke/setup-spoke.sh b/spoke/setup-spoke.sh
index dc153d8..f0763ef 100755
--- a/spoke/setup-spoke.sh
+++ b/spoke/setup-spoke.sh
@@ -316,7 +316,7 @@ info "Port $TUNNEL_PORT is available."
 header "Configuring compose.yaml"
 info "Setting port to $TUNNEL_PORT and key to $KEY_NAME..."
 
-SYNCTHING_MOUNT="$ARMBIAN_HOME/st"
+SYNCTHING_MOUNT="$ARMBIAN_HOME/st/data"
 mkdir -p "$SYNCTHING_MOUNT"
 chown "$SPOKE_USER":"$SPOKE_USER" "$SYNCTHING_MOUNT"
 
@@ -328,7 +328,7 @@ sed -i "s|-i /home/[^ ]*/\.ssh/[^ ]*|-i ${SSH_DIR}/${KEY_NAME}|g" "$COMPOSE"
 sed -i "/known_hosts/!s|/home/[^/]*/\.ssh/[^:]*:/home/[^/]*/\.ssh/[^:]*:ro|${SSH_DIR}/${KEY_NAME}:${SSH_DIR}/${KEY_NAME}:ro|g" "$COMPOSE"
 sed -i "s|/home/[^/]*/\.ssh/known_hosts|${SSH_DIR}/known_hosts|g" "$COMPOSE"
 sed -i "s| [a-zA-Z0-9._-]*@[a-zA-Z0-9._-]*\.[a-zA-Z0-9._-]*[[:space:]]*\$| ${HUB_USER}@${HUB_HOST}|" "$COMPOSE"
-sed -i "s|/home/[^/]*/st:|${SYNCTHING_MOUNT}:|g" "$COMPOSE"
+sed -i "s|/home/[^/]*/st/data:|${SYNCTHING_MOUNT}:|g" "$COMPOSE"
 sed -i "s|PUID=[0-9]*|PUID=${SPOKE_UID}|g" "$COMPOSE"
 sed -i "s|PGID=[0-9]*|PGID=${SPOKE_GID}|g" "$COMPOSE"
 sed -i "s|container_name: spoke-autossh|container_name: ${SPOKE_NAME}-autossh|g" "$COMPOSE"
diff --git a/syncthing.sh b/syncthing.sh
index 4e229aa..8a3959a 100755
--- a/syncthing.sh
+++ b/syncthing.sh
@@ -222,7 +222,7 @@ else:
 
 add_folder() {
     header "Add Folder"
-    read -rp "Folder path on this device (e.g. /var/syncthing/docs): " FOLDER_PATH
+    read -rp "Folder path on this device (e.g. /var/syncthing/data/books): " FOLDER_PATH
     [ -n "$FOLDER_PATH" ] || die "Path cannot be empty."
     read -rp "Folder label (human-readable name): " FOLDER_LABEL
     [ -n "$FOLDER_LABEL" ] || die "Label cannot be empty."