test

Master.conf

@@ -3,56 +3,40 @@
 #----------------------------- Master Variables for unRAID scripts -----------------------------
 #-----------------------------------------------------------------------------------------------
 
-# Hostnames of both servers, used for SSH key mapping and remote detection (Actual UunRAID's Host Names)
+#-------------------- Host Configuration --------------------
+# Hostnames of both servers
 HOST1="unRAID-Gmer4Lfe"
 HOST2="unRAID-Jayred365"
 
-# SSH Key Mapping (used for rsync scripts to determine which SSH key to use based on source and destination)
+# SSH Key Mapping (data only)
 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 --------------------------------------------------------------
 #-----------------------------------------------------------------------------------------------
 
-#--------------------Rsync Script Defaults-----------------------
-# Network speed limit (KB/s)
+#-------------------- Rsync Defaults -----------------------
 BW_LIMIT=12500
-# Retry logic
 RETRY_COUNT=3
-# Sleep between retries (seconds)
 SLEEP=300
-# Max number of concurrently running rsync processes
 MAX_RSYNC_PROCS=1
-# Container start/stop/restart before and after rsync
 CRITICAL_CONTAINER_NAMES=("")
-# Containers that need delayed before starting
 DELAYED_CONTAINERS=("")
-# Delay in seconds between starting containers, useful for things like Authelia
 CONTAINER_DELAY=5
-# Not include logs during transfer
 EXCLUDE_DIRS=("")
 
-#-------------------- unRAID essentail scripts ------------------
-# unRAID reboot script user warning time (seconds)
+#-------------------- Essential Scripts ------------------
 REBOOT_SLEEP=300
-# unRAID mover stop script timeout (seconds)
 MOVER_STOP_TIMEOUT=300
-# docker_syslog_filter.sh filter file path
 FILTER_FILE="/etc/rsyslog.d/ignore-docker-veth.conf"
-# php_fpm_max_children.sh php-fpm config file path
 PHP_CONF="/etc/php-fpm.d/www.conf"
-# php_fpm_max_children.sh max children value
 PHP_MAX_CHILDREN=250
 
 #----------------------------------------------------------------------------------------------
 #----------------------------------- Profile System -------------------------------------------
 #----------------------------------------------------------------------------------------------
-# Profiles are mainly used for rsync operations, but can be used for any variable that needs
-# to be different based on the source or destination.
-#
-# Profiles are inferred from the directory basename (lowercased)
 
 declare -A PROFILE_MAX_PROCS
 PROFILE_MAX_PROCS["arrs_stack"]=2
@@ -109,42 +93,7 @@ PROFILE_EXCLUDE_DIRS["critical-data"]="logs *.tmp"
 PROFILE_EXCLUDE_DIRS["gmer4lfe"]="logs *.tmp"
 PROFILE_EXCLUDE_DIRS["important-data"]="logs *.tmp"
 PROFILE_EXCLUDE_DIRS["emby"]="logs *.tmp"
+
 #-----------------------------------------------------------------------------------------------
-#---------------End Of User Variables, Please adjust here in Master.conf as needed -------------
-#-----------------------------------------------------------------------------------------------
-
-
-# Detect local hostname
-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"
-
-
-# Remote Server Ip Resolution
-# 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
-
-
-# SSH Key Mapping
-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"
+#----------------------------- End of Master.conf ----------------------------------------------
+#-----------------------------------------------------------------------------------------------