From 9e6a6f222263d65afd15388e23aa7912f74adff0 Mon Sep 17 00:00:00 2001 From: Justin Oros Date: Sat, 18 Apr 2026 13:41:13 -0700 Subject: [PATCH] fix compose.yaml sed: known_hosts collision, hub user/host, syncthing mount path, var ordering --- spoke/setup-spoke.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/spoke/setup-spoke.sh b/spoke/setup-spoke.sh index 586204a..ec44847 100755 --- a/spoke/setup-spoke.sh +++ b/spoke/setup-spoke.sh @@ -308,18 +308,21 @@ done header "Configuring compose.yaml" info "Setting port to $TUNNEL_PORT and key to $KEY_NAME..." +SYNCTHING_MOUNT="$ARMBIAN_HOME/st" +mkdir -p "$SYNCTHING_MOUNT" +chown "$SPOKE_USER":"$SPOKE_USER" "$SYNCTHING_MOUNT" + sed -i "s|-R [0-9]*:localhost:22|-R ${TUNNEL_PORT}:localhost:22|g" "$COMPOSE" sed -i "s|-i /home/[^ ]*/\.ssh/[^ ]*|-i ${SSH_DIR}/${KEY_NAME}|g" "$COMPOSE" -sed -i "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|[a-zA-Z0-9._-]*@[a-zA-Z0-9._-]*\.[a-zA-Z0-9._-]*$|${HUB_USER}@${HUB_HOST}|g" "$COMPOSE" +sed -i "s|/home/[^/]*/st:|${SYNCTHING_MOUNT}:|g" "$COMPOSE" sed -i "s|container_name: spoke-autossh|container_name: ${SPOKE_NAME}-autossh|g" "$COMPOSE" sed -i "s|container_name: spoke-syncthing|container_name: ${SPOKE_NAME}-syncthing|g" "$COMPOSE" sed -i "s|hostname: spoke-syncthing|hostname: ${SPOKE_NAME}-syncthing|g" "$COMPOSE" sed -i '/^version:/d' "$COMPOSE" -SYNCTHING_MOUNT="$ARMBIAN_HOME/st" -mkdir -p "$SYNCTHING_MOUNT" -chown "$SPOKE_USER":"$SPOKE_USER" "$SYNCTHING_MOUNT" header "Building Docker Image" cd "$SPOKE_DIR"