added argmuent parsing for rsync options, added default global options and profile-specific options, updated Master.conf

Master.conf

@@ -41,6 +41,8 @@ DELAYED_CONTAINERS=("")
 CONTAINER_DELAY=5
 # Not include logs during transfer
 EXCLUDE_DIRS=("")
+# Default global rsync options
+DEFAULT_RSYNC_OPTS=(-av --info=progress2 --human-readable --bwlimit="$BW_LIMIT" --delete --inplace --no-whole-file)
 
 #-------------------- unRAID essentail scripts ------------------
 # unRAID reboot script user warning time (seconds)
@@ -56,6 +58,15 @@ PHP_MAX_CHILDREN=250
 
 #---------------------- Profile System -------------------------
 # Profiles are inferred from the directory basename (lowercased)
+# Profile-specific rsync options (override global) must list all options as they do not inherit from global
+#   For example, look up at global rsync options above 
+declare -A PROFILE_RSYNC_OPTS=(
+    [arrs_stack]="-av --info=progress2 --human-readable --bwlimit=$BW_LIMIT --delete --inplace --no-whole-file"
+    [critical-data]="-av --human-readable --bwlimit=$BW_LIMIT --delete"
+    [gmer4lfe]="-av --info=progress2 --bwlimit=$BW_LIMIT"
+    [important-data]="-av --human-readable --bwlimit=$BW_LIMIT"
+    [emby]="-av --human-readable --bwlimit=$BW_LIMIT"
+)
 # Max rsync processes per profile
 declare -A PROFILE_MAX_PROCS=(
     [arrs_stack]=2

Rsync/rsync.sh

@@ -19,27 +19,23 @@ set -e
 #-----------------------------------------------------------------------------------------------
 #----------------- User Variables, Please adjust here in Master.conf as needed -----------------
 #-----------------------------------------------------------------------------------------------
-#
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
+# Load configs & helpers
-# Load config & helpers
 source "$SCRIPT_DIR/../Master.conf"
 source "$SCRIPT_DIR/../common.sh"
 
-# Input directory
+# ----------------------------- Input -----------------------------
 DIRECTORY="$1"
 if [[ -z "$DIRECTORY" ]]; then
     echo "Usage: $0 <directory-to-sync> [--dry-run] [VAR=value ...]"
     exit 1
 fi
-
+shift
-shift 1
 parse_args "$@"
 
-# Profile detection
+# ----------------------------- Profile -----------------------------
 PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')
-echo "Detected profile: $PROFILE_NAME"
 
 MAX_RSYNC_PROCS=${PROFILE_MAX_PROCS[$PROFILE_NAME]:-$MAX_RSYNC_PROCS}
 BW_LIMIT=${PROFILE_BW_LIMIT[$PROFILE_NAME]:-$BW_LIMIT}
@@ -50,23 +46,38 @@ RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
 SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
 EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}})
 
-echo "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT, CONTAINERS=${CRITICAL_CONTAINER_NAMES[*]}, EXCLUDES=${EXCLUDE_DIRS[*]}"
+[[ "$ENABLE_LOGGING" == true ]] && echo "Detected profile: $PROFILE_NAME"
+[[ "$ENABLE_LOGGING" == true ]] && echo "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT, CONTAINERS=${CRITICAL_CONTAINER_NAMES[*]}, EXCLUDES=${EXCLUDE_DIRS[*]}"
+
+# ----------------------------- Main Sync -----------------------------
+wait_for_rsync() {
+    for attempt in $(seq 1 "$RETRY_COUNT"); do
+        RSYNC_COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
+        if [ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]; then
+            [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Waiting... ($RSYNC_COUNT active rsync processes)"
+            sleep "$SLEEP"
+        else
+            return 0
+        fi
+    done
+    echo "Too many rsync processes, exiting."
+    exit 1
+}
 
-# Main sync logic
 main() {
-    echo "[$LOCAL_SERVER_NAME] Syncing $DIRECTORY → $REMOTE_SERVER:$DIRECTORY"
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Syncing $DIRECTORY → $REMOTE_SERVER:$DIRECTORY"
 
     for i in $(seq 1 "$RETRY_COUNT"); do
-        if check_server_online; then break; fi
+        if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then break; fi
         echo "Remote $REMOTE_SERVER_NAME down, retrying in $SLEEP seconds..."
         sleep "$SLEEP"
     done
-    check_server_online || { echo "Remote $REMOTE_SERVER_NAME unreachable. Exiting."; exit 1; }
+    ping -c 1 "$REMOTE_SERVER" &>/dev/null || { echo "Remote $REMOTE_SERVER_NAME unreachable. Exiting."; exit 1; }
 
     wait_for_rsync
     stop_containers
+    get_rsync_opts
 
-    RSYNC_OPTS=(-av --info=progress2 --human-readable --bwlimit="$BW_LIMIT" --delete --inplace --no-whole-file)
     for ex in "${EXCLUDE_DIRS[@]}"; do RSYNC_OPTS+=(--exclude="$ex"); done
     [ "$DRY_RUN" = true ] && RSYNC_OPTS+=("--dry-run")
 
@@ -90,7 +101,7 @@ main() {
     done
 
     start_containers
-    echo "[$LOCAL_SERVER_NAME] Sync complete."
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Sync complete."
 }
 
 main

common.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
-#-----------------------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------------------------
-#----------------------------- Common helpers for unRAID scripts -------------------------------
+# Common Helpers for Unraid Scripts
-#-----------------------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------------------------
 
-# Requires Master.conf to be sourced first
+# ----------------------------- Argument Parsing -----------------------------
-# ----------------------------- Helpers -----------------------------
 parse_args() {
+    DRY_RUN=${DRY_RUN:-false}
     for ARG in "$@"; do
         if [[ "$ARG" == *=* ]]; then
-            local VAR_NAME="${ARG%%=*}"
+            VAR_NAME="${ARG%%=*}"
-            local VAR_VALUE="${ARG#*=}"
+            VAR_VALUE="${ARG#*=}"
             if declare -p "$VAR_NAME" &>/dev/null; then
                 printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
-                echo "Overriding $VAR_NAME -> $VAR_VALUE"
+                [[ "$ENABLE_LOGGING" == true ]] && echo "Overriding $VAR_NAME -> $VAR_VALUE"
             else
                 echo "Warning: Unknown variable $VAR_NAME, ignoring."
             fi
@@ -56,37 +56,34 @@ else
     exit 1
 fi
 
-# SSH key mapping
 declare -A SSH_KEYS
 SSH_KEYS["$HOST1|$HOST2"]="$HOST1_SSH_KEY"
 SSH_KEYS["$HOST2|$HOST1"]="$HOST2_SSH_KEY"
+
 KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
 SSH_KEY="${SSH_KEYS[$KEY_ID]}"
 if [[ -z "$SSH_KEY" ]]; then
     echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
     exit 1
 fi
-echo "Using SSH key: $SSH_KEY"
 
-# Remote IP via Tailscale
+# ----------------------------- Remote Server 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
-echo "Remote IP: $REMOTE_SERVER"
 
 # ----------------------------- Container Helpers -----------------------------
 declare -a RUNNING_CONTAINERS=()
 
 stop_containers() {
-    echo "[$LOCAL_SERVER_NAME] Checking containers on ${REMOTE_SERVER_NAME}..."
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Checking containers on $REMOTE_SERVER_NAME..."
     RUNNING_CONTAINERS=()
     for container in "${CRITICAL_CONTAINER_NAMES[@]}"; do
-        STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \
+        STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false")
-            "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false")
+        if [[ "$STATUS" == "true" ]]; then
-        if [ "$STATUS" == "true" ]; then
+            [[ "$ENABLE_LOGGING" == true ]] && echo "Stopping $container"
-            echo "Stopping $container"
             RUNNING_CONTAINERS+=("$container")
             ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $container"
         fi
@@ -94,30 +91,21 @@ stop_containers() {
 }
 
 start_containers() {
-    echo "[$LOCAL_SERVER_NAME] Restarting containers on ${REMOTE_SERVER_NAME}..."
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Restarting containers on $REMOTE_SERVER_NAME..."
     for container in "${RUNNING_CONTAINERS[@]}"; do
         if [[ " ${DELAYED_CONTAINERS[*]} " == *" $container "* ]]; then
-            echo "Delaying start of $container by ${CONTAINER_DELAY}s..."
+            [[ "$ENABLE_LOGGING" == true ]] && echo "Delaying start of $container by ${CONTAINER_DELAY}s..."
             sleep "$CONTAINER_DELAY"
         fi
         ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $container"
     done
 }
 
-wait_for_rsync() {
+# ----------------------------- Rsync Options Builder -----------------------------
-    for attempt in $(seq 1 "$RETRY_COUNT"); do
+get_rsync_opts() {
-        RSYNC_COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
+    if [[ -n "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]:-}" ]]; then
-        if [ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]; then
+        read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}"
-            echo "[$LOCAL_SERVER_NAME] Waiting... ($RSYNC_COUNT active rsync processes)"
+    else
-            sleep "$SLEEP"
+        RSYNC_OPTS=("${DEFAULT_RSYNC_OPTS[@]}")
-        else
+    fi
-            return 0
-        fi
-    done
-    echo "Too many rsync processes, exiting."
-    exit 1
-}
-
-check_server_online() {
-    timeout 5 ping -c 1 "$REMOTE_SERVER" &>/dev/null
 }