1
0
forked from finn/tinyboard

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

This commit is contained in:
Justin Oros
2026-04-18 21:08:22 -07:00
parent 982b8a8641
commit 9e4fba591a
3 changed files with 8 additions and 4 deletions

View File

@@ -28,4 +28,8 @@ services:
- "127.0.0.1:8384:8384" - "127.0.0.1:8384:8384"
- "22000:22000" - "22000:22000"
volumes: volumes:
- /home/armbian/st:/var/syncthing - syncthing-config:/var/syncthing/config
- /home/armbian/st/data:/var/syncthing/data
volumes:
syncthing-config:

View File

@@ -316,7 +316,7 @@ info "Port $TUNNEL_PORT is available."
header "Configuring compose.yaml" header "Configuring compose.yaml"
info "Setting port to $TUNNEL_PORT and key to $KEY_NAME..." 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" mkdir -p "$SYNCTHING_MOUNT"
chown "$SPOKE_USER":"$SPOKE_USER" "$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 "/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|/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| [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|PUID=[0-9]*|PUID=${SPOKE_UID}|g" "$COMPOSE"
sed -i "s|PGID=[0-9]*|PGID=${SPOKE_GID}|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" sed -i "s|container_name: spoke-autossh|container_name: ${SPOKE_NAME}-autossh|g" "$COMPOSE"

View File

@@ -222,7 +222,7 @@ else:
add_folder() { add_folder() {
header "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." [ -n "$FOLDER_PATH" ] || die "Path cannot be empty."
read -rp "Folder label (human-readable name): " FOLDER_LABEL read -rp "Folder label (human-readable name): " FOLDER_LABEL
[ -n "$FOLDER_LABEL" ] || die "Label cannot be empty." [ -n "$FOLDER_LABEL" ] || die "Label cannot be empty."