forked from finn/tinyboard
fix SPOKE_DIR path and replace hardcoded finn/oily.dad with dynamic HUB_HOST
This commit is contained in:
@@ -6,7 +6,7 @@ HUB_USER="armbian"
|
|||||||
ARMBIAN_HOME="/home/armbian"
|
ARMBIAN_HOME="/home/armbian"
|
||||||
SSH_DIR="$ARMBIAN_HOME/.ssh"
|
SSH_DIR="$ARMBIAN_HOME/.ssh"
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
SPOKE_DIR="$SCRIPT_DIR/spoke"
|
SPOKE_DIR="$SCRIPT_DIR"
|
||||||
COMPOSE="$SPOKE_DIR/compose.yaml"
|
COMPOSE="$SPOKE_DIR/compose.yaml"
|
||||||
START_PORT=11111
|
START_PORT=11111
|
||||||
|
|
||||||
@@ -93,13 +93,13 @@ case "$KEY_CHOICE" in
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo -e "${YELLOW}══════════════════════════════════════════${NC}"
|
echo -e "${YELLOW}══════════════════════════════════════════${NC}"
|
||||||
echo -e "${YELLOW} Send this public key to finn (oily.dad owner)${NC}"
|
echo -e "${YELLOW} Send this public key to the hub owner${NC}"
|
||||||
echo -e "${YELLOW} and ask him to add it to armbian@oily.dad authorized_keys:${NC}"
|
echo -e "${YELLOW} and ask them to add it to armbian@${HUB_HOST} authorized_keys:${NC}"
|
||||||
echo -e "${YELLOW}══════════════════════════════════════════${NC}"
|
echo -e "${YELLOW}══════════════════════════════════════════${NC}"
|
||||||
cat "$KEY_PATH.pub"
|
cat "$KEY_PATH.pub"
|
||||||
echo -e "${YELLOW}══════════════════════════════════════════${NC}"
|
echo -e "${YELLOW}══════════════════════════════════════════${NC}"
|
||||||
echo ""
|
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)
|
2)
|
||||||
read -rp "Enter a name for the key file (e.g. oilykey): " KEY_NAME
|
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 " Tunnel port: ${GREEN}$TUNNEL_PORT${NC} on $HUB_HOST"
|
||||||
echo -e " SSH key: ${GREEN}$KEY_PATH${NC}"
|
echo -e " SSH key: ${GREEN}$KEY_PATH${NC}"
|
||||||
echo ""
|
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 ""
|
||||||
echo " 1. Generate a hub->spoke key:"
|
echo " 1. Generate a hub->spoke key:"
|
||||||
echo " ssh-keygen -t ed25519 -f ~/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m)"
|
echo " ssh-keygen -t ed25519 -f ~/.ssh/armbian-${SPOKE_NAME}-$(date +%Y%m)"
|
||||||
|
|||||||
Reference in New Issue
Block a user