Consolidate all paths to plugin flash dir, fix watchdog 7.3 triggers
- Move SCRIPTS_DIR/DATA_DIR/STATE_DIR from appdata to /boot/config/plugins/varaverk - All state files now in STATE_DIR (no more /tmp or /boot/config root writes) - Bootstrap: Gitea-first clone with GitHub fallback, no array dependency - varaverk.cfg seeded with Gitea connection settings - .gitignore: add State_Files/, varaverk.cfg, varaverk-*.txz - Partnership/transcode/fallback scripts use STATE_DIR variables - PHP config.php: DATA_DIR/STATE_DIR constants, VV_SETUP_STATE_FILE dynamic - deploy.sh PROD_ROOT updated to plugin flash dir Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Gmer4Lfe
co-authored by
Claude Sonnet 4.6
Claude Sonnet 4.6
parent
9191a54637
commit
fb0530deba
@@ -111,11 +111,14 @@
|
||||
# ==============================================================================================
|
||||
# ── SHARED HOST CONFIGURATION ─────────────────────────────────────────────────────────────────
|
||||
# ==============================================================================================
|
||||
# DATA_DIR is the same path on all servers — persistent script state and statistics.
|
||||
# Array share — survives reboots, no flash drive wear.
|
||||
# Created automatically if it doesn't exist.
|
||||
# Only truly critical files (fallback state, watchdog reboot log) stay on /boot/config.
|
||||
DATA_DIR="/mnt/user/appdata/Varaverk/data"
|
||||
# All Varaverk persistent data lives under /mnt/user/appdata/Varaverk/.
|
||||
# Both directories are created automatically if they don't exist.
|
||||
#
|
||||
# DATA_DIR — historical logs, statistics, discovery histories, blocklists
|
||||
# STATE_DIR — runtime state files for all scripts (watchdogs, fallback, transcode, etc.)
|
||||
# Requirement: ALL state files MUST use $STATE_DIR. No /tmp, no /boot/config.
|
||||
DATA_DIR="/boot/config/plugins/varaverk/data"
|
||||
STATE_DIR="/boot/config/plugins/varaverk/State_Files"
|
||||
|
||||
# ── Version Parity ──
|
||||
# Controls behaviour when local and remote unRAID versions differ.
|
||||
@@ -152,9 +155,11 @@
|
||||
# All identity vars (hostnames, SSH keys) live in host*.conf.
|
||||
# Hostnames already match Tailscale device names — IP resolution is automatic.
|
||||
#
|
||||
# State files on /boot/config — survives reboots, available before array starts:
|
||||
# /boot/config/partnership_HOST1.db ← HOST1 writes only
|
||||
# /boot/config/partnership_HOST2.db ← HOST2 writes only
|
||||
# State files in STATE_DIR — survives reboots, array must be up (scripts run after array start):
|
||||
# STATE_DIR/partnership_HOST1.db ← HOST1 writes only
|
||||
# STATE_DIR/partnership_HOST2.db ← HOST2 writes only
|
||||
# STATE_DIR/partnership_blocklist.db ← shared blocklist
|
||||
# STATE_DIR/varaverk_setup.db ← onboarding progress state
|
||||
# Propagated via SSH — no rsync needed
|
||||
#
|
||||
# critical_sync_maintenance.sh runs --check every 30min:
|
||||
@@ -185,6 +190,11 @@
|
||||
PARTNERSHIP_OFFLINE_THRESHOLD=30 # days either server unreachable before auto-offboard
|
||||
# works both directions independently
|
||||
|
||||
# Partnership and setup state files — all in STATE_DIR per the project requirement.
|
||||
# Scripts use these variables; do not hardcode /boot/config paths in scripts.
|
||||
PARTNERSHIP_BLOCKLIST_FILE="$STATE_DIR/partnership_blocklist.db"
|
||||
VARAVERK_SETUP_FILE="$STATE_DIR/varaverk_setup.db"
|
||||
|
||||
# Tailscale removal on offboard.
|
||||
PARTNERSHIP_REMOVE_TAILSCALE=true # remove mirror from Tailscale tailnet on offboard
|
||||
# false = skip removal (manual or testing)
|
||||
@@ -250,7 +260,7 @@
|
||||
GITEA_CONTAINER="Gitea"
|
||||
GITEA_REPO_PATH="FailedProxy/Varaverk.git"
|
||||
GITEA_DOMAIN="" # e.g. git.yourdomain.com — requires NPM + DNS
|
||||
TARGET_DIR="/mnt/user/appdata/Varaverk"
|
||||
TARGET_DIR="/boot/config/plugins/varaverk"
|
||||
GITEA_SSH_KEY="/root/.ssh/unraid_gitea"
|
||||
SSH_PORT=221 # Gitea SSH port (default 22, Gitea often uses 221/222)
|
||||
GITEA_HTTP_PORT=3000 # Gitea web/API port — used by gitea_ssh_setup.sh
|
||||
@@ -420,7 +430,7 @@
|
||||
|
||||
MONTHLY_UPTIME_THRESHOLD_DAYS=30 # minimum uptime in days before maintenance fires
|
||||
MONTHLY_RUN_INTERVAL_DAYS=30 # minimum days since last run before running again
|
||||
MONTHLY_LAST_RUN_FILE="/boot/config/monthly_maintenance_last_run.db"
|
||||
MONTHLY_LAST_RUN_FILE="$STATE_DIR/monthly_maintenance_last_run.db"
|
||||
|
||||
# ━━━ Sunday Morning Coffee Report ━━━
|
||||
# Orchestrator that runs all Sunday monitor scripts in sequence.
|
||||
@@ -633,7 +643,7 @@
|
||||
EXTERNAL_IP="8.8.8.8"
|
||||
FALLBACK_CHECK_INTERVAL=30 # seconds between fallback state checks
|
||||
FALLBACK_HANDBACK_STRIKES=3 # consecutive healthy checks before initiating handback (3×30s = 90s)
|
||||
FALLBACK_STATE_FILE="/boot/config/fallback_state.db"
|
||||
FALLBACK_STATE_FILE="$STATE_DIR/fallback_state.db"
|
||||
FALLBACK_ENABLED=true # HOST2 back online
|
||||
# false = suppresses "not running" warnings in status scripts
|
||||
FALLBACK_PARTNERSHIP_REQUIRED=true # gate fallback on an active partnership
|
||||
@@ -700,8 +710,8 @@
|
||||
# HOST*_WATCHDOG_SCAN_IGNORE — skip in Tier 2 scan
|
||||
# HOST*_WATCHDOG_DEPENDENCIES — dependency ordering for restart decisions
|
||||
|
||||
# Strike state file — /tmp resets on reboot (correct — no stale strikes after reboot)
|
||||
WATCHDOG_STATE_FILE="/tmp/container_watchdog_state.db"
|
||||
# Strike state file — persistent in STATE_DIR
|
||||
WATCHDOG_STATE_FILE="$STATE_DIR/container_watchdog_state.db"
|
||||
|
||||
# CPU thresholds — normalised against total core count at runtime
|
||||
SOFT_CPU_THRESHOLD=80 # warn at this % of total system CPU
|
||||
@@ -768,8 +778,8 @@
|
||||
WATCHDOG_APPDATA_LOG_MAX_GB=2 # flag *.log files exceeding this size (absolute)
|
||||
WATCHDOG_APPDATA_TRUNCATE_LOGS=false # set true to auto-truncate oversized *.log files on action cycle
|
||||
WATCHDOG_APPDATA_STRIKE_LIMIT=3 # cycles before action fires (matches existing watchdog pattern)
|
||||
WATCHDOG_APPDATA_GROWTH_FILE="/tmp/watchdog_appdata_growth.db" # /tmp — resets on reboot ✅
|
||||
STORAGE_WATCHDOG_STATE_FILE="/tmp/storage_watchdog_state.db" # /tmp — resets on reboot ✅
|
||||
WATCHDOG_APPDATA_GROWTH_FILE="$STATE_DIR/watchdog_appdata_growth.db"
|
||||
STORAGE_WATCHDOG_STATE_FILE="$STATE_DIR/storage_watchdog_state.db"
|
||||
|
||||
# ━━━ Docker Network Connect ━━━
|
||||
# Ensures custom networks exist and connects containers at array start.
|
||||
@@ -855,7 +865,7 @@
|
||||
NETWORK_WATCHDOG_CHECK_TAILSCALE=true
|
||||
NETWORK_WATCHDOG_NPM_TIMEOUT=10
|
||||
NETWORK_WATCHDOG_NPM_STRIKE_LIMIT=2
|
||||
NETWORK_WATCHDOG_NPM_STATE_FILE="/tmp/network_watchdog_state.db"
|
||||
NETWORK_WATCHDOG_NPM_STATE_FILE="$STATE_DIR/network_watchdog_state.db"
|
||||
|
||||
# ━━━ WebGUI Watchdog ━━━
|
||||
# Monitors unRAID WebGUI responsiveness — escalates through nginx restart → emhttp restart.
|
||||
@@ -1164,6 +1174,7 @@
|
||||
TRANSCODE_MANAGER_MODE="smart"
|
||||
|
||||
# Daily statistics log — read by weekly_health_digest.sh for transcode summary.
|
||||
TRANSCODE_STATE_FILE="$STATE_DIR/transcode_state.db"
|
||||
TRANSCODE_DAILY_LOG="$DATA_DIR/transcode_daily.db"
|
||||
TRANSCODE_LOG_RETENTION=90 # days before old entries purged
|
||||
|
||||
@@ -1209,7 +1220,7 @@
|
||||
|
||||
# ━━━ ZFS Memory Snapshot ━━━
|
||||
# Weekly ZFS pool health and memory diagnostic report — informational only.
|
||||
ZFS_REPORT_LOG="/var/log/zfs-weekly-health.log"
|
||||
ZFS_REPORT_LOG="$DATA_DIR/zfs-weekly-health.log"
|
||||
ZFS_REPORT_ARC_WARN_PCT=90 # warn if ARC using more than this % of its max
|
||||
ZFS_REPORT_FREE_WARN_GB=10 # warn if less than this GB free RAM
|
||||
ZFS_REPORT_AVAIL_WARN_GB=20 # warn if less than this GB available on ZFS pool
|
||||
@@ -1264,7 +1275,7 @@
|
||||
# HOST*_RW_STOP_CONTAINERS — docker stop at hard pressure (in host*.conf)
|
||||
|
||||
RW_ENABLED=true
|
||||
RW_STATE_FILE="/tmp/resource_watchdog_state.db"
|
||||
RW_STATE_FILE="$STATE_DIR/resource_watchdog_state.db"
|
||||
|
||||
# ━━━ Pressure Thresholds ━━━
|
||||
# Graduated RAM response — resource_watchdog acts before system_watchdog reboots.
|
||||
@@ -1334,10 +1345,10 @@
|
||||
# Warn/shutdown/recover RAM tiers are handled by resource_watchdog.sh
|
||||
|
||||
# ━━━ State Files ━━━
|
||||
SYS_WATCHDOG_STATE_FILE="/tmp/system_watchdog_state.db" # /tmp — resets on reboot ✅
|
||||
SYS_WATCHDOG_FAILED_FILE="/boot/config/system_watchdog_failed.db"
|
||||
SYS_WATCHDOG_REBOOT_LOG="/boot/config/system_watchdog_reboots.db"
|
||||
SYS_WATCHDOG_OOM_FILE="/tmp/system_watchdog_oom.db" # /tmp — resets on reboot ✅
|
||||
SYS_WATCHDOG_STATE_FILE="$STATE_DIR/system_watchdog_state.db"
|
||||
SYS_WATCHDOG_FAILED_FILE="$STATE_DIR/system_watchdog_failed.db"
|
||||
SYS_WATCHDOG_REBOOT_LOG="$STATE_DIR/system_watchdog_reboots.db"
|
||||
SYS_WATCHDOG_OOM_FILE="$STATE_DIR/system_watchdog_oom.db"
|
||||
|
||||
# ━━━ Strike and Reboot Loop Settings ━━━
|
||||
# Strike system: a check must fail this many consecutive cycles before action is taken.
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# ==============================================================================================
|
||||
|
||||
DEV_ROOT="/mnt/cloud-storage/Important Shit/Git/Development/Varaverk"
|
||||
PROD_ROOT="/mnt/user/appdata/Varaverk"
|
||||
PROD_ROOT="/boot/config/plugins/varaverk"
|
||||
UPGRADE="$PROD_ROOT/Deployment/conf_upgrade.sh"
|
||||
LOG="/tmp/vv_deploy.log"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user