From 7676a907eed6ee959966569615155f6b0d8f9928 Mon Sep 17 00:00:00 2001 From: Justin Oros Date: Thu, 16 Apr 2026 10:35:50 -0700 Subject: [PATCH] add SPOKE_USER prompt and replace all hardcoded armbian references in setup-spoke.sh --- spoke/setup-spoke.sh | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/spoke/setup-spoke.sh b/spoke/setup-spoke.sh index 32e3ae0..987fd47 100644 --- a/spoke/setup-spoke.sh +++ b/spoke/setup-spoke.sh @@ -3,7 +3,7 @@ set -euo pipefail HUB_HOST="" HUB_USER="" -ARMBIAN_HOME="/home/armbian" +ARMBIAN_HOME="/home/$SPOKE_USER" SSH_DIR="$ARMBIAN_HOME/.ssh" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SPOKE_DIR="$SCRIPT_DIR" @@ -46,6 +46,8 @@ read -rp "Hub hostname [oily.dad]: " HUB_HOST HUB_HOST="${HUB_HOST:-oily.dad}" read -rp "Hub SSH user [armbian]: " HUB_USER HUB_USER="${HUB_USER:-armbian}" +read -rp "Spoke local user [armbian]: " SPOKE_USER +SPOKE_USER="${SPOKE_USER:-armbian}" header "TinyBoard Spoke Setup" @@ -108,8 +110,8 @@ if ! docker compose version >/dev/null 2>&1; then fi fi -info "Adding armbian to docker group..." -usermod -aG docker armbian 2>/dev/null || true +info "Adding $SPOKE_USER to docker group..." +usermod -aG docker "$SPOKE_USER" 2>/dev/null || true info "Enabling SSH server..." if systemctl enable ssh 2>/dev/null; then @@ -142,22 +144,22 @@ case "$KEY_CHOICE" in KEY_NAME="${KEY_NAME:-hubkey}" KEY_PATH="$SSH_DIR/$KEY_NAME" mkdir -p "$SSH_DIR" - chown armbian:armbian "$SSH_DIR" + chown "$SPOKE_USER":"$SPOKE_USER" "$SSH_DIR" chmod 700 "$SSH_DIR" if [ -f "$KEY_PATH" ]; then warn "Key $KEY_PATH already exists, using it." else info "Generating new ED25519 key..." - sudo -u armbian ssh-keygen -t ed25519 -f "$KEY_PATH" -N "" - chown armbian:armbian "$KEY_PATH" "$KEY_PATH.pub" + sudo -u "$SPOKE_USER" ssh-keygen -t ed25519 -f "$KEY_PATH" -N "" + chown "$SPOKE_USER":"$SPOKE_USER" "$KEY_PATH" "$KEY_PATH.pub" chmod 600 "$KEY_PATH" fi echo "" echo -e "${YELLOW}══════════════════════════════════════════${NC}" echo -e "${YELLOW} Send this public key to the hub owner${NC}" - echo -e "${YELLOW} and ask them to add it to armbian@${HUB_HOST} authorized_keys:${NC}" + echo -e "${YELLOW} and ask them to add it to ${HUB_USER}@${HUB_HOST} authorized_keys:${NC}" echo -e "${YELLOW}══════════════════════════════════════════${NC}" cat "$KEY_PATH.pub" echo -e "${YELLOW}══════════════════════════════════════════${NC}" @@ -169,13 +171,13 @@ case "$KEY_CHOICE" in KEY_NAME="${KEY_NAME:-hubkey}" KEY_PATH="$SSH_DIR/$KEY_NAME" mkdir -p "$SSH_DIR" - chown armbian:armbian "$SSH_DIR" + chown "$SPOKE_USER":"$SPOKE_USER" "$SSH_DIR" chmod 700 "$SSH_DIR" echo "Paste the private key content below, then press ENTER and CTRL+D:" KEY_CONTENT=$(cat | tr -d '\r') printf '%s\n' "$KEY_CONTENT" > "$KEY_PATH" - chown armbian:armbian "$KEY_PATH" + chown "$SPOKE_USER":"$SPOKE_USER" "$KEY_PATH" chmod 600 "$KEY_PATH" info "Key saved to $KEY_PATH" ;; @@ -185,22 +187,22 @@ case "$KEY_CHOICE" in esac info "Scanning hub host key..." -sudo -u armbian touch "$SSH_DIR/known_hosts" -chown armbian:armbian "$SSH_DIR/known_hosts" +sudo -u "$SPOKE_USER" touch "$SSH_DIR/known_hosts" +chown "$SPOKE_USER":"$SPOKE_USER" "$SSH_DIR/known_hosts" chmod 600 "$SSH_DIR/known_hosts" -sudo -u armbian ssh-keyscan -H "$HUB_HOST" >> "$SSH_DIR/known_hosts" 2>/dev/null +sudo -u "$SPOKE_USER" ssh-keyscan -H "$HUB_HOST" >> "$SSH_DIR/known_hosts" 2>/dev/null header "Testing SSH Connection" info "Testing connection to $HUB_HOST..." retry_or_abort \ - "sudo -u armbian ssh -i \"$KEY_PATH\" -o BatchMode=yes -o ConnectTimeout=10 \"$HUB_USER@$HUB_HOST\" exit" \ + "sudo -u "$SPOKE_USER" ssh -i \"$KEY_PATH\" -o BatchMode=yes -o ConnectTimeout=10 \"$HUB_USER@$HUB_HOST\" exit" \ "SSH connection to $HUB_HOST failed. Check that the hub owner added your public key." header "Finding Available Tunnel Port" info "Scanning for a free port on $HUB_HOST starting from $START_PORT..." TUNNEL_PORT="" for PORT in $(seq "$START_PORT" $((START_PORT + 20))); do - RESULT=$(sudo -u armbian ssh -i "$KEY_PATH" "$HUB_USER@$HUB_HOST" "ss -tlnp | grep :$PORT" 2>/dev/null || true) + RESULT=$(sudo -u "$SPOKE_USER" ssh -i "$KEY_PATH" "$HUB_USER@$HUB_HOST" "ss -tlnp | grep :$PORT" 2>/dev/null || true) if [ -z "$RESULT" ]; then TUNNEL_PORT="$PORT" info "Port $TUNNEL_PORT is available." @@ -225,13 +227,13 @@ sed -i '/^version:/d' "$COMPOSE" SYNCTHING_MOUNT="$ARMBIAN_HOME/st" mkdir -p "$SYNCTHING_MOUNT" -chown armbian:armbian "$SYNCTHING_MOUNT" +chown "$SPOKE_USER":"$SPOKE_USER" "$SYNCTHING_MOUNT" header "Building Docker Image" cd "$SPOKE_DIR" docker build \ - --build-arg UID="$(id -u armbian)" \ - --build-arg GID="$(id -g armbian)" \ + --build-arg UID="$(id -u "$SPOKE_USER")" \ + --build-arg GID="$(id -g "$SPOKE_USER")" \ -t spoke-autossh . header "Starting Containers" @@ -259,14 +261,14 @@ echo " 1. Generate a hub->spoke key:" echo " ssh-keygen -t ed25519 -f ~/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m)" echo "" echo " 2. Copy it to this spoke through the tunnel:" -echo " ssh-copy-id -i ~/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m).pub -p $TUNNEL_PORT armbian@localhost" +echo " ssh-copy-id -i ~/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m).pub -p $TUNNEL_PORT ${HUB_USER}@localhost" echo "" echo " 3. Add an rclone remote in ~/.config/rclone/rclone.conf:" echo " [${SPOKE_NAME}-remote]" echo " type = sftp" echo " host = localhost" echo " port = $TUNNEL_PORT" -echo " key_file = /home/armbian/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m)" +echo " key_file = /home/$HUB_USER/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m)" echo " shell_type = unix" echo " md5sum_command = md5sum" echo " sha1sum_command = sha1sum"