FailedProxy/Varaverk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reconf the master and common scripts and all unraid essential scripts# Please enter the commit message for your changes. Lines starting

Browse Source
This commit is contained in:
FailedProxy
2026-03-24 00:28:11 +00:00
parent efb35cd9c4
commit 9300ae11c2
10 changed files with 454 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.sh
+45 -19
View File
@@ -17,11 +17,10 @@
#---------------End Of User Variables, Please adjust in Master.conf as needed ------------------
#-----------------------------------------------------------------------------------------------
# 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 +32,7 @@ load_master_conf() {
fi
}
# Parse CLI arguments (flags + VAR=value overrides)
# Parse CLI args
parse_args() {
DRY_RUN=${DRY_RUN:-false}
@@ -43,48 +42,75 @@ 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 to be set
require_var() {
local var="$1"
if [[ -z "${!var:-}" ]]; then
echo "Error: Required variable $var is not set."
exit 1
fi
}
# Host and Remote Detection
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 dynamically
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
# Determine 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"
}