Consolidate conf templates into Configurations/ — remove stale Deployment/conf_templates/

Deployment/conf_templates/ had two stale files: host.conf.template was a copy of host1.conf
(not a HOSTN template), and master.conf had hardcoded hostnames and an old appdata DATA_DIR path.
The correct templates already exist in Configurations/ (master.conf.template, host.conf.template).

Updated varaverk.plg and git_pull_execute.sh to read from Configurations/ directly.
Removed TMPL_DIR variable from git_pull_execute.sh — CONF_DIR covers both.
This commit is contained in:
Gmer4Lfe
2026-06-12 21:35:58 -04:00
parent 129e8ae14a
commit 3937d5e33b
5 changed files with 10 additions and 2213 deletions
+5 -6
View File
@@ -281,7 +281,6 @@ echo ""
echo "━━━ $ICON_GEAR Conf Upgrade ━━━"
UPGRADE_SCRIPT="$TARGET_DIR/Deployment/conf_upgrade.sh"
TMPL_DIR="$TARGET_DIR/Deployment/conf_templates"
CONF_DIR="$TARGET_DIR/Configurations"
if [[ ! -f "$UPGRADE_SCRIPT" ]]; then
@@ -292,20 +291,20 @@ elif [[ "$SYNC_SUCCESS" == true ]]; then
_DRY=""
# master.conf
if [[ -f "$TMPL_DIR/master.conf" && -f "$CONF_DIR/master.conf" ]]; then
if [[ -f "$CONF_DIR/master.conf.template" && -f "$CONF_DIR/master.conf" ]]; then
bash "$UPGRADE_SCRIPT" \
--template "$TMPL_DIR/master.conf" \
--template "$CONF_DIR/master.conf.template" \
--target "$CONF_DIR/master.conf" \
--backup $_DRY
else
warn "master.conf template or target not found — skipping"
warn "master.conf.template or master.conf not found — skipping"
fi
# This server's host conf only — sparse checkout ensures we have it
HOST_CONF="$CONF_DIR/${MY_ID,,}.conf"
if [[ -f "$TMPL_DIR/host.conf.template" && -f "$HOST_CONF" ]]; then
if [[ -f "$CONF_DIR/host.conf.template" && -f "$HOST_CONF" ]]; then
bash "$UPGRADE_SCRIPT" \
--template "$TMPL_DIR/host.conf.template" \
--template "$CONF_DIR/host.conf.template" \
--target "$HOST_CONF" \
--backup $_DRY
else