Changed daily script to master.conf variables

Rsync/rsync.sh

@@ -4,54 +4,51 @@
 # ----------------------------------------------------------------------------------------------
 # ---------------- User Variables, Please adjust in Master.conf as needed ----------------------
 # ----------------------------------------------------------------------------------------------
-
+ 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
+ 
 source "$SCRIPT_DIR/../Master.conf"
 source "$SCRIPT_DIR/../common.sh"
-
+ 
 # -----------------------------------------------------------------------------------------------
 # Separate the positional directory argument from flag/key=value args
 # -----------------------------------------------------------------------------------------------
 DIRECTORY=""
 RAW_ARGS=()
-
+ 
 for ARG in "$@"; do
     case "$ARG" in
         --*|*=*) RAW_ARGS+=("$ARG") ;;
         *) [[ -z "$DIRECTORY" ]] && DIRECTORY="$ARG" || RAW_ARGS+=("$ARG") ;;
     esac
 done
-
+ 
 parse_args "${RAW_ARGS[@]}"
-
+ 
 [[ -z "$DIRECTORY" ]] && error "No directory specified. Usage: rsync.sh <dir> [--dry-run] [--log]" && exit 1
-
+ 
 detect_hosts
 resolve_remote_ip
-
+ 
 # -----------------------------------------------------------------------------------------------
 # Profile resolution — inferred from the directory basename
 # -----------------------------------------------------------------------------------------------
 PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')
 info "Profile: $PROFILE_NAME"
-
+ 
 # Scalar overrides from profile
-MAX_RSYNC_PROCS=${PROFILE_MAX_PROCS[$PROFILE_NAME]:-$MAX_RSYNC_PROCS}
 BW_LIMIT=${PROFILE_BW_LIMIT[$PROFILE_NAME]:-$BW_LIMIT}
 RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
 SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
 CONTAINER_DELAY=${PROFILE_CONTAINER_DELAY[$PROFILE_NAME]:-$CONTAINER_DELAY}
-
+ 
 # Array overrides from profile — convert space-separated strings to proper bash arrays
 read -r -a CRITICAL_CONTAINER_NAMES <<< "${PROFILE_CRITICAL_CONTAINER_NAMES[$PROFILE_NAME]:-}"
 read -r -a DELAYED_CONTAINERS       <<< "${PROFILE_DELAYED_CONTAINERS[$PROFILE_NAME]:-}"
 read -r -a EXCLUDE_DIRS             <<< "${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-}"
-echo "DEBUG containers array size: ${#CRITICAL_CONTAINER_NAMES[@]}"
-echo "DEBUG containers content: ${CRITICAL_CONTAINER_NAMES[*]}"
-
+ 
 [[ "$SHOW_STATUS" == true ]] && show_status && exit 0
-
+ 
 # -----------------------------------------------------------------------------------------------
 # Run
 # -----------------------------------------------------------------------------------------------
@@ -61,23 +58,21 @@ echo "Source:  $DIRECTORY"
 echo "Remote:  $REMOTE_SERVER:$DIRECTORY"
 echo "Profile: $PROFILE_NAME"
 echo ""
-
-wait_for_rsync
-
+ 
 stop_containers
-
+ 
 get_rsync_opts
-
+ 
 # Append excludes
 for ex in "${EXCLUDE_DIRS[@]}"; do
     [[ -n "$ex" ]] && RSYNC_OPTS+=(--exclude="$ex")
 done
-
+ 
 [[ "$DRY_RUN" == true ]] && RSYNC_OPTS+=("--dry-run") && warn "DRY RUN — no changes will be made"
-
+ 
 START=$(date +%s)
 RSYNC_SUCCESS=false
-
+ 
 for i in $(seq 1 "$RETRY_COUNT"); do
     if rsync "${RSYNC_OPTS[@]}" \
         -e "ssh -i $SSH_KEY -T -o Compression=no -o IPQoS=throughput" \
@@ -90,11 +85,11 @@ for i in $(seq 1 "$RETRY_COUNT"); do
         [[ "$i" -lt "$RETRY_COUNT" ]] && info "Retrying in ${SLEEP}s..." && sleep "$SLEEP"
     fi
 done
-
+ 
 start_containers
-
+ 
 END=$(date +%s)
-
+ 
 echo ""
 echo "===== SUMMARY ====="
 echo "Directory: $DIRECTORY"
@@ -106,6 +101,6 @@ else
     echo "Status:    $ICON_ERROR FAILED after $RETRY_COUNT attempts"
 fi
 echo "==================="
-
+ 
 [[ "$RSYNC_SUCCESS" == false ]] && exit 1
-exit 0
+exit 0