From b8d2a3e5bc9d6354f6f05bed5f6206026f1b923e Mon Sep 17 00:00:00 2001 From: Justin Oros Date: Thu, 16 Apr 2026 10:05:25 -0700 Subject: [PATCH] fix SPOKE_DIR path and replace hardcoded finn/oily.dad with dynamic HUB_HOST --- spoke/setup-spoke.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spoke/setup-spoke.sh b/spoke/setup-spoke.sh index 71f4c23..b1e65be 100644 --- a/spoke/setup-spoke.sh +++ b/spoke/setup-spoke.sh @@ -6,7 +6,7 @@ HUB_USER="armbian" ARMBIAN_HOME="/home/armbian" SSH_DIR="$ARMBIAN_HOME/.ssh" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -SPOKE_DIR="$SCRIPT_DIR/spoke" +SPOKE_DIR="$SCRIPT_DIR" COMPOSE="$SPOKE_DIR/compose.yaml" START_PORT=11111 @@ -93,13 +93,13 @@ case "$KEY_CHOICE" in echo "" echo -e "${YELLOW}══════════════════════════════════════════${NC}" - echo -e "${YELLOW} Send this public key to finn (oily.dad owner)${NC}" - echo -e "${YELLOW} and ask him to add it to armbian@oily.dad authorized_keys:${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}══════════════════════════════════════════${NC}" cat "$KEY_PATH.pub" echo -e "${YELLOW}══════════════════════════════════════════${NC}" echo "" - read -rp "Press ENTER once finn has added the key to oily.dad..." + read -rp "Press ENTER once the key has been added to ${HUB_HOST}..." ;; 2) read -rp "Enter a name for the key file (e.g. oilykey): " KEY_NAME @@ -190,7 +190,7 @@ echo -e " Spoke name: ${GREEN}$SPOKE_NAME${NC}" echo -e " Tunnel port: ${GREEN}$TUNNEL_PORT${NC} on $HUB_HOST" echo -e " SSH key: ${GREEN}$KEY_PATH${NC}" echo "" -echo -e "${YELLOW}Finn needs to do the following on oily.dad:${NC}" +echo -e "${YELLOW}The hub owner needs to do the following on ${HUB_HOST}:${NC}" echo "" echo " 1. Generate a hub->spoke key:" echo " ssh-keygen -t ed25519 -f ~/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m)"