From 555fbb1b23ae3824af31fcca035ee571d8991c68 Mon Sep 17 00:00:00 2001 From: FailedProxy Date: Fri, 24 Apr 2026 16:01:16 -0400 Subject: [PATCH] fixed relative paths in array started --- Master.conf | 38 +++++++++---------- Orchestrators/array_start.sh | 7 ++-- ...ntenance.sh => weekly_sync_maintenance.sh} | 0 3 files changed, 23 insertions(+), 22 deletions(-) rename Orchestrators/{weekly _sync_maintenance.sh => weekly_sync_maintenance.sh} (100%) diff --git a/Master.conf b/Master.conf index 25603d7..7b84e73 100644 --- a/Master.conf +++ b/Master.conf @@ -157,10 +157,10 @@ ARRAY_START_SCRIPTS=( "unRAID_Essentials/ramdisk_setup.sh" # creates ramdisk + symlink before Emby starts "unRAID_Essentials/docker_syslog_filter.sh" # suppress veth noise before logs fill "unRAID_Essentials/php_fpm_max_children.sh" # WebGUI performance tuning - "Docker_Essentials/docker_network_connect.sh" # connect containers to extra networks + #"Docker_Essentials/docker_network_connect.sh" # connect containers to extra networks "unRAID_Essentials/system_watchdog.sh" # system health monitor — continuous loop "Docker_Essentials/docker_watchdog.sh" # container health monitor — continuous loop - "Failover/failover.sh" # mutual failover — continuous loop + #"Failover/failover.sh" # mutual failover — continuous loop ) # ━━━ Daily Sync Maintenance ━━━ @@ -201,6 +201,20 @@ HOST2_DAILY_SYNC_SHARES=( /mnt/user/Anime_Shows ) +# Job list run directly by daily_sync_maintenance.sh after the media share sync. +# Runs sequentially — permissions first, then cleaners, then arr cleanup. +# Comment out any job to disable without removing it. +# Each individual script can still be run manually for one-off maintenance. + +MEDIA_MANAGEMENT_JOBS=( + "Media/media_shares_permissions.sh" # apply permissions — runs first + "Media/media_cleaner.sh anime" # remove junk from anime shares + "Media/media_cleaner.sh media" # remove junk from media shares + "Media/lidarr_cleanup.sh" # remove orphaned music files + "Media/sonarr_cleanup.sh" # remove orphaned TV files + "Media/radarr_cleanup.sh" # remove orphaned movie files +) + # Personal encrypted shares — synced for offsite backup, independent of media shares. # ZFS encrypted at dataset level — remote receives encrypted blocks, cannot read content. # See README-Rsync_Setup.md for ZFS encryption setup before uncommenting. @@ -238,20 +252,6 @@ WEEKLY_SYNC_JOBS=( CRITICAL_SYNC_UPDATES=true # pull container updates locally CRITICAL_SYNC_UPDATES_REMOTE=false # pull container updates on remote via SSH -# ━━━ Media Management ━━━ -# Job list for Orchestrators/media_management.sh — called by daily_sync_maintenance.sh. -# Runs sequentially — permissions first, then cleaners, then arr cleanup. -# Comment out any job to disable without removing it. - -MEDIA_MANAGEMENT_JOBS=( - "Media/media_shares_permissions.sh" # apply permissions — runs first - "Media/media_cleaner.sh anime" # remove junk from anime shares - "Media/media_cleaner.sh media" # remove junk from media shares - #"Media/lidarr_cleanup.sh" # remove orphaned music files - #"Media/sonarr_cleanup.sh" # remove orphaned TV files - #"Media/radarr_cleanup.sh" # remove orphaned movie files -) - # ============================================================================================== # ── RSYNC ───────────────────────────────────────────────────────────────────────────────────── # ============================================================================================== @@ -640,12 +640,12 @@ declare -A WATCHDOG_DEPENDENCIES=( # ━━━ Docker Network Connect ━━━ # Connects containers to extra networks on array start via array_start.sh. NETWORK_CONNECT_CONTAINERS=( -# "memcached" -# "Npm-CrowdSec" + "memcached" + "Npm-CrowdSec" ) NETWORK_CONNECT_NETWORKS=( -# "high-availability" + "high-availability" ) # ============================================================================================== diff --git a/Orchestrators/array_start.sh b/Orchestrators/array_start.sh index 26cd311..93e7814 100644 --- a/Orchestrators/array_start.sh +++ b/Orchestrators/array_start.sh @@ -20,9 +20,10 @@ # ----------------------------------------------------------------------------------------------- SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +ECOSYSTEM_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" -source "$SCRIPT_DIR/Master.conf" -source "$SCRIPT_DIR/common.sh" +source "$ECOSYSTEM_ROOT/Master.conf" +source "$ECOSYSTEM_ROOT/common.sh" # ----------------------------------------------------------------------------------------------- # ━━━ $ICON_GEAR Setup ━━━ @@ -47,7 +48,7 @@ FAILED=0 for relative_path in "${ARRAY_START_SCRIPTS[@]}"; do [[ -z "$relative_path" ]] && continue - SCRIPT_PATH="$SCRIPT_DIR/$relative_path" + SCRIPT_PATH="$ECOSYSTEM_ROOT/$relative_path" SCRIPT_NAME=$(basename "$SCRIPT_PATH") if [[ ! -f "$SCRIPT_PATH" ]]; then diff --git a/Orchestrators/weekly _sync_maintenance.sh b/Orchestrators/weekly_sync_maintenance.sh similarity index 100% rename from Orchestrators/weekly _sync_maintenance.sh rename to Orchestrators/weekly_sync_maintenance.sh