mirror of
https://github.com/myronblair/jarvis
synced 2026-07-28 08:43:00 -05:00
Claude
8399048252
jarvis-backup.sh now also archives /etc/jarvis-arc (reactor.env), /etc/jarvis (db.env), the jarvis-arc.service.d systemd drop-ins, and /usr/local/bin/jarvis-*.sh. Previously a restore would have come back with no API keys or DB password since those moved outside /var/www/jarvis + /opt/jarvis-arc during the secrets sweep. Verified: ran a real backup (45M) and confirmed all new paths are present in the archive. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
51 lines
2.6 KiB
Bash
Executable File
51 lines
2.6 KiB
Bash
Executable File
#!/bin/bash
|
|
[ -r /etc/jarvis/db.env ] && . /etc/jarvis/db.env
|
|
# JARVIS backup — DB dump + all files needed to actually restore JARVIS, as tar.gz
|
|
# Fixed 2026-07-07: this only ever backed up the MySQL database. If this VM were
|
|
# lost, the DB alone is useless without the application code, the reactor daemon,
|
|
# its systemd unit, and the nginx site config — none of which were captured. Also
|
|
# fixed a typo ($SIYE -> $SIZE) that silently broke the size line in the log.
|
|
BACKUP_DIR="/var/backups/jarvis"
|
|
LOG="$BACKUP_DIR/backup.log"
|
|
LOCK="$BACKUP_DIR/backup.lock"
|
|
DB_NAME="jarvis_db"
|
|
DB_USER="jarvis_user"
|
|
DB_PASS="${JARVIS_DB_PASS:?DB pass unset - see /etc/jarvis/db.env}"
|
|
TIMESTAMP=$(date +"%Y%m%d_%H%M%S")
|
|
OUTFILE="$BACKUP_DIR/jarvis_backup_${TIMESTAMP}.tar.gz"
|
|
TMPDIR=$(mktemp -d)
|
|
|
|
mkdir -p "$BACKUP_DIR"
|
|
touch "$LOCK"
|
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Starting backup..." >> "$LOG"
|
|
|
|
cleanup() { rm -rf "$TMPDIR"; rm -f "$LOCK"; }
|
|
trap cleanup EXIT
|
|
|
|
if mysqldump -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" > "$TMPDIR/jarvis_db.sql" 2>>"$LOG"; then
|
|
mkdir -p "$TMPDIR/files/etc"
|
|
cp -a /var/www/jarvis "$TMPDIR/files/var-www-jarvis"
|
|
cp -a /opt/jarvis-arc "$TMPDIR/files/opt-jarvis-arc"
|
|
cp -a /etc/nginx/sites-enabled/jarvis "$TMPDIR/files/etc/nginx-site-jarvis" 2>>"$LOG"
|
|
cp -a /etc/systemd/system/jarvis-arc.service "$TMPDIR/files/etc/jarvis-arc.service" 2>>"$LOG"
|
|
crontab -l > "$TMPDIR/files/etc/root-crontab.txt" 2>>"$LOG"
|
|
# Phase 1/2 additions: secrets + systemd drop-ins + operational scripts
|
|
# (these live outside /var/www/jarvis and /opt/jarvis-arc, so must be
|
|
# captured explicitly or a restore comes back with no keys/DB pass).
|
|
cp -a /etc/jarvis-arc "$TMPDIR/files/etc/jarvis-arc-etc" 2>>"$LOG" # reactor.env
|
|
cp -a /etc/jarvis "$TMPDIR/files/etc/jarvis-etc" 2>>"$LOG" # db.env
|
|
cp -a /etc/systemd/system/jarvis-arc.service.d "$TMPDIR/files/etc/jarvis-arc.service.d" 2>>"$LOG"
|
|
mkdir -p "$TMPDIR/files/usr-local-bin"
|
|
cp -a /usr/local/bin/jarvis-*.sh "$TMPDIR/files/usr-local-bin/" 2>>"$LOG" # health/deploy/watchdog/netscan
|
|
|
|
tar -czf "$OUTFILE" -C "$TMPDIR" jarvis_db.sql files
|
|
SIZE=$(du -sh "$OUTFILE" | cut -f1)
|
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Backup OK: $(basename "$OUTFILE") ($SIZE)" >> "$LOG"
|
|
else
|
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] ERROR: mysqldump failed" >> "$LOG"
|
|
exit 1
|
|
fi
|
|
|
|
find "$BACKUP_DIR" -name "jarvis_backup_*.tar.gz" -mtime +7 -delete
|
|
COUNT=$(ls "$BACKUP_DIR"/jarvis_backup_*.tar.gz 2>/dev/null | wc -l)
|
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Done. Files retained: $COUNT" >> "$LOG" |