Deployment: gitignore, remove script, version bump to 2026.05.30
.gitignore:
Excludes Configurations/host*.conf + master.conf (personal credentials)
and Configurations/*.bak, data/, *.log, *.lock.
Templates remain tracked. Files stay on disk — only untracked from git.
Plugin/varaverk.plg:
Version: 2026.05.28 → 2026.05.30
<CHANGES>: proper changelog entries for both releases covering
wizard, setup flow, Partnership highlights, HOST2 paths,
onboard Step 9, pre-onboard graceful state, GitHub links.
Remove script: stops fallback.sh cleanly (--stop), kills watchdog
orchestrator, removes cron file + calls update_cron, removes web
symlink and plugin flash dir. Preserves appdata with clear message.
This commit is contained in:
+59
-5
@@ -2,7 +2,7 @@
|
||||
<!DOCTYPE PLUGIN [
|
||||
<!ENTITY name "varaverk">
|
||||
<!ENTITY author "gmer4lfe">
|
||||
<!ENTITY version "2026.05.28">
|
||||
<!ENTITY version "2026.05.30">
|
||||
<!ENTITY launch "varaverk/monitor">
|
||||
<!ENTITY github "https://github.com/FailedProxy/Varaverk">
|
||||
<!ENTITY branch "main">
|
||||
@@ -14,8 +14,22 @@
|
||||
icon="/plugins/varaverk/icons/varaverk.png">
|
||||
|
||||
<CHANGES>
|
||||
###2026.05.30
|
||||
- First-run setup wizard: auto-detects hostname, creates master.conf + host conf from templates
|
||||
- Scheduler setup mode: after wizard, master.conf and host conf open sequentially with forced save flow
|
||||
- Partnership tab: Onboard button highlighted on arrival from wizard; disabled until partner is configured
|
||||
- HOST2 install paths: state-file pull, master.conf push detection, conf-only flow
|
||||
- Onboard Step 9: master.conf automatically pushed to all listed hosts on onboard completion
|
||||
- Graceful pre-onboard state: neutral banners instead of error warnings before SSH is configured
|
||||
- GitHub link in tab bar and Settings page; Community Apps support URL
|
||||
|
||||
###2026.05.28
|
||||
- Initial release
|
||||
- Initial release: Monitor, Scheduler, Docker, Watchdog, Partnership, Fallback, Arrs tabs
|
||||
- Mutual container fallback with tiered escalation and strike-confirmed handback
|
||||
- Partnership lifecycle: onboard, offboard, transfer
|
||||
- Rsync profile system with per-share container stops and writeback
|
||||
- Watchdog: Tier 1 (explicit) + Tier 2 (global scan) container monitoring
|
||||
- master.conf push-on-save to all configured partners via SSH
|
||||
</CHANGES>
|
||||
|
||||
<!--
|
||||
@@ -159,9 +173,49 @@ fi
|
||||
<INLINE>
|
||||
<![CDATA[
|
||||
#!/bin/bash
|
||||
WEB_DIR="/usr/local/emhttp/plugins/varaverk"
|
||||
[[ -L "$WEB_DIR" ]] && rm -f "$WEB_DIR" && echo "Varaverk: removed web symlink"
|
||||
echo "Varaverk: scripts and conf in appdata are preserved"
|
||||
PLUGIN="varaverk"
|
||||
CFG_DIR="/boot/config/plugins/$PLUGIN"
|
||||
CFG_FILE="$CFG_DIR/varaverk.cfg"
|
||||
CRON_FILE="$CFG_DIR/varaverk.cron"
|
||||
WEB_DIR="/usr/local/emhttp/plugins/$PLUGIN"
|
||||
|
||||
log() { echo "[Varaverk remove] $*"; }
|
||||
|
||||
# Read SCRIPTS_DIR so we can locate running scripts
|
||||
if [[ -f "$CFG_FILE" ]]; then
|
||||
_sd=$(grep -oP '(?<=SCRIPTS_DIR=")[^"]+' "$CFG_FILE" 2>/dev/null)
|
||||
fi
|
||||
SCRIPTS_DIR="${_sd:-/mnt/user/appdata/Varaverk}"
|
||||
|
||||
# ── Stop continuous background scripts ───────────────────────────────────────
|
||||
# fallback.sh manages its own lock — use --stop for clean shutdown
|
||||
if [[ -f "$SCRIPTS_DIR/Fallback/fallback.sh" ]]; then
|
||||
bash "$SCRIPTS_DIR/Fallback/fallback.sh" --stop 2>/dev/null && \
|
||||
log "fallback.sh stopped" || true
|
||||
fi
|
||||
|
||||
# Kill any remaining Varaverk background processes (watchdog orchestrator, etc.)
|
||||
pkill -f "run_job.sh" 2>/dev/null || true
|
||||
pkill -f "watchdog_orchestrator.sh" 2>/dev/null || true
|
||||
|
||||
# ── Remove cron entries ───────────────────────────────────────────────────────
|
||||
if [[ -f "$CRON_FILE" ]]; then
|
||||
rm -f "$CRON_FILE"
|
||||
/usr/local/sbin/update_cron 2>/dev/null || true
|
||||
log "Cron entries removed"
|
||||
fi
|
||||
# Remove legacy direct cron file if it exists
|
||||
rm -f /etc/cron.d/varaverk
|
||||
|
||||
# ── Remove web symlink ────────────────────────────────────────────────────────
|
||||
[[ -L "$WEB_DIR" ]] && rm -f "$WEB_DIR" && log "Web symlink removed"
|
||||
|
||||
# ── Remove plugin config from flash ──────────────────────────────────────────
|
||||
rm -rf "$CFG_DIR"
|
||||
log "Plugin config removed from flash"
|
||||
|
||||
log "Done. Scripts and conf in $SCRIPTS_DIR are preserved."
|
||||
log "To fully remove: delete $SCRIPTS_DIR manually."
|
||||
]]>
|
||||
</INLINE>
|
||||
</FILE>
|
||||
|
||||
Reference in New Issue
Block a user