Watchdogs/ folder + host conf rename
Move all watchdog scripts to a dedicated Watchdogs/ folder: Docker_Essentials/docker_watchdog.sh → Watchdogs/ unRAID_Essentials/system_watchdog.sh → Watchdogs/ unRAID_Essentials/resource_watchdog.sh → Watchdogs/ Orchestrators/watchdog_orchestrator.sh → Watchdogs/ Tools/watchdog_skip_list_manager.sh → Watchdogs/ Rename host config files: master_host1.conf → host1.conf master_host2.conf → host2.conf Update all references across the ecosystem: master.conf: WATCHDOG_ORCHESTRATOR_SCRIPTS paths → Watchdogs/ load_config.sh: host*.conf glob + all comments git_pull_execute.sh: sparse checkout glob + all comments Partnership/ssh_setup.sh: HOST_CONF path construction user_script_plug-in.sh: all script paths + per-host conf path common.sh, README.md, README-User_Script_Plug-in.md: comment refs All Partnership, Fallback, Monitors, Transcodes, Tools scripts: comment refs
This commit is contained in:
+11
-11
@@ -7,23 +7,23 @@
|
||||
#
|
||||
# ── HOW IT WORKS ──────────────────────────────────────────────────────────────────────────────
|
||||
# 1. Sources master.conf (shared config — hostnames, thresholds, toggles, profiles, job lists)
|
||||
# 2. Auto-discovers and sources all master_host*.conf files in the same directory
|
||||
# 2. Auto-discovers and sources all host*.conf files in the same directory
|
||||
# Each host conf extends the shared profile arrays and adds host-specific credentials
|
||||
# 3. Sources common.sh (shared functions — detect_hosts, logging, notifications etc.)
|
||||
#
|
||||
# ── WHY THIS EXISTS ───────────────────────────────────────────────────────────────────────────
|
||||
# Without this loader every script had to explicitly source each conf file:
|
||||
# source master.conf
|
||||
# source master_host1.conf
|
||||
# source master_host2.conf
|
||||
# source host1.conf
|
||||
# source host2.conf
|
||||
# source common.sh
|
||||
#
|
||||
# Adding a new server meant updating every script.
|
||||
# With this loader — add master_host3.conf to the git repo and every server
|
||||
# With this loader — add host3.conf to the git repo and every server
|
||||
# auto-discovers it on next git pull. Zero script changes required. Ever.
|
||||
#
|
||||
# ── ADDING A NEW SERVER ───────────────────────────────────────────────────────────────────────
|
||||
# 1. Create master_host3.conf following the same structure as HOST1/HOST2
|
||||
# 1. Create host3.conf following the same structure as HOST1/HOST2
|
||||
# 2. Commit and push to git repo
|
||||
# 3. All servers pull it automatically — no other changes needed
|
||||
#
|
||||
@@ -40,9 +40,9 @@
|
||||
# source "$SCRIPT_DIR/load_config.sh"
|
||||
#
|
||||
# ── SPARSE CHECKOUT NOTE ──────────────────────────────────────────────────────────────────────
|
||||
# Sparse checkout controls which master_host*.conf files each server receives.
|
||||
# HOST1 only pulls master_host1.conf — never HOST2's credentials.
|
||||
# HOST2 only pulls master_host2.conf — never HOST1's credentials.
|
||||
# Sparse checkout controls which host*.conf files each server receives.
|
||||
# HOST1 only pulls host1.conf — never HOST2's credentials.
|
||||
# HOST2 only pulls host2.conf — never HOST1's credentials.
|
||||
# This loader sources whatever conf files ARE present — sparse checkout handles the rest.
|
||||
# Both servers pull all non-credential conf files (master.conf, common.sh, load_config.sh).
|
||||
#
|
||||
@@ -63,14 +63,14 @@
|
||||
fi
|
||||
source "$LOAD_CONFIG_DIR/master.conf"
|
||||
|
||||
# ━━━ Auto-discover and source all master_host*.conf files ━━━
|
||||
# ━━━ Auto-discover and source all host*.conf files ━━━
|
||||
# Sorted for consistent load order — HOST1 before HOST2 before HOST3 etc.
|
||||
# Each host conf extends the shared PROFILE_* arrays and adds host-specific vars.
|
||||
# Missing files are silently skipped — sparse checkout intentionally withholds some.
|
||||
# At least one host conf must be present or the ecosystem has no identity to work with.
|
||||
_host_confs_loaded=0
|
||||
|
||||
for _conf in $(ls "$LOAD_CONFIG_DIR"/master_host*.conf 2>/dev/null | sort); do
|
||||
for _conf in $(ls "$LOAD_CONFIG_DIR"/host*.conf 2>/dev/null | sort); do
|
||||
if [[ -f "$_conf" ]]; then
|
||||
source "$_conf"
|
||||
(( _host_confs_loaded++ ))
|
||||
@@ -80,7 +80,7 @@
|
||||
done
|
||||
|
||||
if [[ "$_host_confs_loaded" -eq 0 ]]; then
|
||||
echo "[FATAL] No master_host*.conf files found in $LOAD_CONFIG_DIR" >&2
|
||||
echo "[FATAL] No host*.conf files found in $LOAD_CONFIG_DIR" >&2
|
||||
echo "[FATAL] At least one host conf required — check git pull and sparse checkout" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user