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

test commit for Master.conf and common.sh updates

Browse Source
This commit is contained in:
FailedProxy
2026-03-24 00:50:01 +00:00
parent 8a2fa81c40
commit 60a86e42d7
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Master.conf
+6 -7
View File
@@ -7,6 +7,11 @@
HOST1="unRAID-Gmer4Lfe" HOST1="unRAID-Gmer4Lfe"
HOST2="unRAID-Jayred365" HOST2="unRAID-Jayred365"
# SSH Key Mapping (used for rsync scripts to determine which SSH key to use based on source and destination)
declare -A SSH_KEYS
SSH_KEYS["unRAID-Gmer4Lfe|unRAID-Jayred365"]="/root/.ssh/Gmer4Lfe-rsync-key"
SSH_KEYS["unRAID-Jayred365|unRAID-Gmer4Lfe"]="/root/.ssh/Jayred365-rsync-key"
#----------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------
#----------------- User Variables, Please adjust here in Master.conf as needed ----------------- #----------------- User Variables, Please adjust here in Master.conf as needed -----------------
#----------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------
@@ -106,10 +111,4 @@ PROFILE_EXCLUDE_DIRS["important-data"]="logs *.tmp"
PROFILE_EXCLUDE_DIRS["emby"]="logs *.tmp" PROFILE_EXCLUDE_DIRS["emby"]="logs *.tmp"
#----------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------
#---------------End Of User Variables, Please adjust here in Master.conf as needed ------------- #---------------End Of User Variables, Please adjust here in Master.conf as needed -------------
#----------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------
# SSH Key Mapping (used for rsync scripts to determine which SSH key to use based on source and destination)
declare -A SSH_KEYS
SSH_KEYS["unRAID-Gmer4Lfe|unRAID-Jayred365"]="/root/.ssh/Gmer4Lfe-rsync-key"
SSH_KEYS["unRAID-Jayred365|unRAID-Gmer4Lfe"]="/root/.ssh/Jayred365-rsync-key"
common.sh
+12 -2
View File
@@ -24,6 +24,7 @@ load_master_conf() {
local master_conf="$script_dir/../Master.conf" local master_conf="$script_dir/../Master.conf"
if [ -f "$master_conf" ]; then if [ -f "$master_conf" ]; then
# shellcheck source=/dev/null
source "$master_conf" source "$master_conf"
echo "Loaded Master.conf from $master_conf" echo "Loaded Master.conf from $master_conf"
else else
@@ -79,8 +80,16 @@ require_var() {
fi fi
} }
#-----------------------------------------------------------------------------------------------
# Host and Remote Detection # Host and Remote Detection
# Uses HOST1, HOST2, and SSH_KEYS from Master.conf
#-----------------------------------------------------------------------------------------------
detect_hosts() { detect_hosts() {
# Must load Master.conf first
require_var HOST1
require_var HOST2
require_var SSH_KEYS
LOCAL_HOSTNAME="$(hostname)" LOCAL_HOSTNAME="$(hostname)"
if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then
@@ -97,14 +106,14 @@ detect_hosts() {
echo "Local server: $LOCAL_SERVER_NAME" echo "Local server: $LOCAL_SERVER_NAME"
echo "Remote server: $REMOTE_SERVER_NAME" echo "Remote server: $REMOTE_SERVER_NAME"
# Resolve Tailscale IP dynamically # Resolve remote Tailscale IP
REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null) REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
if [[ -z "$REMOTE_SERVER" ]]; then if [[ -z "$REMOTE_SERVER" ]]; then
echo "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME" echo "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"
exit 1 exit 1
fi fi
# Determine SSH Key # Determine SSH key
KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME" KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
if [[ -n "${SSH_KEYS[$KEY_ID]}" ]]; then if [[ -n "${SSH_KEYS[$KEY_ID]}" ]]; then
SSH_KEY="${SSH_KEYS[$KEY_ID]}" SSH_KEY="${SSH_KEYS[$KEY_ID]}"
@@ -112,5 +121,6 @@ detect_hosts() {
echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME" echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
exit 1 exit 1
fi fi
echo "Using SSH key: $SSH_KEY" echo "Using SSH key: $SSH_KEY"
} }