Relocate conf cache to more discrete paths
This commit is contained in:
+1
-1
@@ -38,7 +38,7 @@
|
|||||||
# ==============================================================================================
|
# ==============================================================================================
|
||||||
#
|
#
|
||||||
# Remote API Access — Cache-First, SSH Fallback
|
# Remote API Access — Cache-First, SSH Fallback
|
||||||
# If conf_sync.sh has populated /tmp/.vv/config/cached/.confs/ and
|
# If conf_sync.sh has populated /tmp/.cache/vv/d/ and
|
||||||
# load_config.sh has sourced it, HOST*_<ARR>_API_KEY vars are available
|
# load_config.sh has sourced it, HOST*_<ARR>_API_KEY vars are available
|
||||||
# in the environment. Remote functions use them to call the arr API
|
# in the environment. Remote functions use them to call the arr API
|
||||||
# directly over Tailscale (no SSH, no remote shell). If the cached key
|
# directly over Tailscale (no SSH, no remote shell). If the cached key
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ source "$SCRIPT_DIR/../load_config.sh"
|
|||||||
parse_args "$@"
|
parse_args "$@"
|
||||||
detect_hosts
|
detect_hosts
|
||||||
|
|
||||||
RAM_CACHE="/tmp/.vv/config/cached/.confs"
|
RAM_CACHE="/tmp/.cache/vv/d"
|
||||||
SAVE_DIR="/boot/config/varaverk/conf_bak"
|
SAVE_DIR="/boot/config/.cache/vv/d"
|
||||||
|
|
||||||
[[ "$DRY_RUN" == true ]] && warn "DRY RUN — no changes will be made"
|
[[ "$DRY_RUN" == true ]] && warn "DRY RUN — no changes will be made"
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#
|
#
|
||||||
# PURPOSE
|
# PURPOSE
|
||||||
# ─────────────────────────────────────────────────────────────────────────────
|
# ─────────────────────────────────────────────────────────────────────────────
|
||||||
# Snapshots the partner conf RAM cache to /boot/config/varaverk/conf_bak/ on
|
# Snapshots the partner conf RAM cache to /boot/config/.cache/vv/d/ on
|
||||||
# array stop. Survives reboot. Used by conf_cache_restore.sh at next array start
|
# array stop. Survives reboot. Used by conf_cache_restore.sh at next array start
|
||||||
# to reload partner vars into RAM when the partner is unreachable at boot time.
|
# to reload partner vars into RAM when the partner is unreachable at boot time.
|
||||||
#
|
#
|
||||||
@@ -24,8 +24,8 @@ source "$SCRIPT_DIR/../load_config.sh"
|
|||||||
parse_args "$@"
|
parse_args "$@"
|
||||||
detect_hosts
|
detect_hosts
|
||||||
|
|
||||||
RAM_CACHE="/tmp/.vv/config/cached/.confs"
|
RAM_CACHE="/tmp/.cache/vv/d"
|
||||||
SAVE_DIR="/boot/config/varaverk/conf_bak"
|
SAVE_DIR="/boot/config/.cache/vv/d"
|
||||||
|
|
||||||
[[ "$DRY_RUN" == true ]] && warn "DRY RUN — no files will be written"
|
[[ "$DRY_RUN" == true ]] && warn "DRY RUN — no files will be written"
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
#
|
#
|
||||||
# PURPOSE
|
# PURPOSE
|
||||||
# ─────────────────────────────────────────────────────────────────────────────
|
# ─────────────────────────────────────────────────────────────────────────────
|
||||||
# Maintains a RAM-resident conf cache at /tmp/.vv/config/cached/.confs/.
|
# Maintains a RAM-resident conf cache at /tmp/.cache/vv/d/.
|
||||||
# Credentials and partner keys live in RAM only — never on disk across hosts.
|
# Credentials and partner keys live in RAM only — never on disk across hosts.
|
||||||
#
|
#
|
||||||
# On array start (default / --array-start):
|
# On array start (default / --array-start):
|
||||||
@@ -54,7 +54,7 @@ if [[ "${CONF_SYNC_ENABLED:-true}" == false ]]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CACHE_DIR="/tmp/.vv/config/cached/.confs"
|
CACHE_DIR="/tmp/.cache/vv/d"
|
||||||
MY_CONF="$SCRIPTS_ROOT/Configurations/${MY_ID,,}.conf"
|
MY_CONF="$SCRIPTS_ROOT/Configurations/${MY_ID,,}.conf"
|
||||||
SSH_TIMEOUT=10
|
SSH_TIMEOUT=10
|
||||||
|
|
||||||
@@ -121,7 +121,7 @@ for host_var in $(compgen -v | grep -E '^HOST[0-9]+$' | sort); do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$DRY_RUN" == true ]]; then
|
if [[ "$DRY_RUN" == true ]]; then
|
||||||
warn "DRY RUN — would push ${MY_ID,,}.conf → $partner_host:/tmp/.vv/config/cached/.confs/"
|
warn "DRY RUN — would push ${MY_ID,,}.conf → $partner_host:/tmp/.cache/vv/d/"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -99,12 +99,12 @@
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# ━━━ Source partner confs from /tmp cache ━━━
|
# ━━━ Source partner confs from /tmp cache ━━━
|
||||||
# conf_sync.sh pulls partner host*.conf files into /tmp/.vv/config/cached/.confs/
|
# conf_sync.sh pulls partner host*.conf files into /tmp/.cache/vv/d/
|
||||||
# on array start and after any conf save. Sourcing them here makes partner vars
|
# on array start and after any conf save. Sourcing them here makes partner vars
|
||||||
# (HOST2_*, HOST3_*, …) available without committing credentials to the git repo
|
# (HOST2_*, HOST3_*, …) available without committing credentials to the git repo
|
||||||
# or violating sparse checkout — partner confs live in RAM only, cleared on reboot.
|
# or violating sparse checkout — partner confs live in RAM only, cleared on reboot.
|
||||||
# Confs already loaded from disk are skipped — disk copy is authoritative.
|
# Confs already loaded from disk are skipped — disk copy is authoritative.
|
||||||
_VV_CONF_CACHE="/tmp/.vv/config/cached/.confs"
|
_VV_CONF_CACHE="/tmp/.cache/vv/d"
|
||||||
if [[ -d "$_VV_CONF_CACHE" ]]; then
|
if [[ -d "$_VV_CONF_CACHE" ]]; then
|
||||||
while IFS= read -r _conf; do
|
while IFS= read -r _conf; do
|
||||||
[[ -f "$_conf" ]] || continue
|
[[ -f "$_conf" ]] || continue
|
||||||
|
|||||||
Reference in New Issue
Block a user