test

common.sh

@@ -1,27 +1,13 @@
 #!/bin/bash
 
 #-----------------------------------------------------------------------------------------------
-# --------------------- Common Shared Functions for Unraid Scripts -----------------------------
-#-----------------------------------------------------------------------------------------------
-#----------------- User Variables, Please adjust in Master.conf as needed ----------------------
-#-----------------------------------------------------------------------------------------------
-# 
-# Nothing to adjust here, all user variables should be in Master.conf
-#
-# This is just a script that has all common functions and logic that are shared
-# between the different scripts. 
-#
-# This way we can avoid code duplication and have a single source 
-# of truth for all common functions and logic.
-#-----------------------------------------------------------------------------------------------
-#---------------End Of User Variables, Please adjust in Master.conf as needed ------------------
+#--------------------- Common Shared Functions -------------------------------------------------
 #-----------------------------------------------------------------------------------------------
 
-# Load Master.conf relative to calling script
+# Load Master.conf
 load_master_conf() {
     local script_dir
     script_dir="$(cd "$(dirname "${BASH_SOURCE[1]}")" && pwd)"
-
     local master_conf="$script_dir/../Master.conf"
 
     if [ -f "$master_conf" ]; then
@@ -33,7 +19,7 @@ load_master_conf() {
     fi
 }
 
-# Parse CLI arguments (flags + VAR=value overrides)
+# Parse CLI arguments
 parse_args() {
     DRY_RUN=${DRY_RUN:-false}
 
@@ -43,44 +29,35 @@ parse_args() {
             local VAR_VALUE="${ARG#*=}"
 
             if declare -p "$VAR_NAME" &>/dev/null; then
-                if [[ "$VAR_NAME" =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then
-                    printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
-                    echo "Overriding $VAR_NAME -> $VAR_VALUE"
-                else
-                    echo "Warning: Invalid variable name $VAR_NAME"
-                fi
+                printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
+                echo "Overriding $VAR_NAME -> $VAR_VALUE"
             else
                 echo "Warning: Unknown variable $VAR_NAME, ignoring."
             fi
         else
             case "$ARG" in
-                --dry-run|-n)
-                    DRY_RUN=true
-                    ;;
+                --dry-run|-n) DRY_RUN=true ;;
                 --help|-h)
                     echo "Usage: script [--dry-run|-n] [VAR=value ...]"
-                    exit 0
-                    ;;
+                    exit 0 ;;
                 *)
-                    echo "Warning: Unknown argument $ARG"
-                    ;;
+                    echo "Warning: Unknown argument $ARG" ;;
             esac
         fi
     done
 }
 
-# Validate integer (non-negative)
+# Validate integer
 validate_int() {
     local name="$1"
     local value="$2"
-
     if ! [[ "${value:-}" =~ ^[0-9]+$ ]]; then
         echo "Error: $name must be a non-negative integer."
         exit 1
     fi
 }
 
-# Optional: require variable to be set
+# Require variable
 require_var() {
     local var="$1"
     if [[ -z "${!var:-}" ]]; then
@@ -88,3 +65,40 @@ require_var() {
         exit 1
     fi
 }
+
+# 🔥 Host + SSH Detection (THE IMPORTANT FIX)
+detect_hosts() {
+    LOCAL_HOSTNAME="$(hostname)"
+
+    if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then
+        LOCAL_SERVER_NAME="$HOST1"
+        REMOTE_SERVER_NAME="$HOST2"
+    elif [[ "$LOCAL_HOSTNAME" == "$HOST2" ]]; then
+        LOCAL_SERVER_NAME="$HOST2"
+        REMOTE_SERVER_NAME="$HOST1"
+    else
+        echo "Error: Local hostname ($LOCAL_HOSTNAME) not recognized."
+        exit 1
+    fi
+
+    echo "Local server: $LOCAL_SERVER_NAME"
+    echo "Remote server: $REMOTE_SERVER_NAME"
+
+    # Resolve Tailscale IP
+    REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
+    if [[ -z "$REMOTE_SERVER" ]]; then
+        echo "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"
+        exit 1
+    fi
+
+    # Assign SSH key
+    KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
+    if [[ -n "${SSH_KEYS[$KEY_ID]}" ]]; then
+        SSH_KEY="${SSH_KEYS[$KEY_ID]}"
+    else
+        echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
+        exit 1
+    fi
+
+    echo "Using SSH key: $SSH_KEY"
+}