mirror of
https://github.com/myronblair/jarvis
synced 2026-07-28 00:34:35 -05:00
Fix backup script: tar.gz output, lockfile, correct log path, install at /usr/local/bin
- Renamed output to jarvis_backup_TIMESTAMP.tar.gz (admin panel pattern) - Log now goes to /var/backups/jarvis/backup.log (admin panel reads this) - Lockfile at /var/backups/jarvis/backup.lock (prevents concurrent runs) - tmpdir + trap cleanup for safe temp handling - Install at /usr/local/bin/jarvis-backup.sh (admin panel trigger path)
This commit is contained in:
+16
-12
@@ -1,27 +1,31 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# JARVIS database backup — runs daily, 7-day retention
|
# JARVIS backup — DB dump as tar.gz, admin-panel compatible
|
||||||
# Lives in repo at /var/www/jarvis/deploy/jarvis-backup.sh
|
|
||||||
|
|
||||||
BACKUP_DIR="/var/backups/jarvis"
|
BACKUP_DIR="/var/backups/jarvis"
|
||||||
LOG="/var/log/jarvis/backup.log"
|
LOG="$BACKUP_DIR/backup.log"
|
||||||
|
LOCK="$BACKUP_DIR/backup.lock"
|
||||||
DB_NAME="jarvis_db"
|
DB_NAME="jarvis_db"
|
||||||
DB_USER="jarvis_user"
|
DB_USER="jarvis_user"
|
||||||
DB_PASS="J4rv1s_Pr0t0c0l_2026!"
|
DB_PASS="J4rv1s_Pr0t0c0l_2026!"
|
||||||
TIMESTAMP=$(date +"%Y%m%d_%H%M%S")
|
TIMESTAMP=$(date +"%Y%m%d_%H%M%S")
|
||||||
OUTFILE="$BACKUP_DIR/${DB_NAME}_${TIMESTAMP}.sql.gz"
|
OUTFILE="$BACKUP_DIR/jarvis_backup_${TIMESTAMP}.tar.gz"
|
||||||
|
TMPDIR=$(mktemp -d)
|
||||||
|
|
||||||
mkdir -p "$BACKUP_DIR"
|
mkdir -p "$BACKUP_DIR"
|
||||||
|
touch "$LOCK"
|
||||||
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Starting backup..." >> "$LOG"
|
||||||
|
|
||||||
echo "[$(date)] Starting backup..." >> "$LOG"
|
cleanup() { rm -rf "$TMPDIR"; rm -f "$LOCK"; }
|
||||||
|
trap cleanup EXIT
|
||||||
|
|
||||||
if mysqldump -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" | gzip > "$OUTFILE"; then
|
if mysqldump -u"$DB_USER" -p"$DB_PASS" "$DB_NAME" > "$TMPDIR/jarvis_db.sql" 2>>"$LOG"; then
|
||||||
|
tar -czf "$OUTFILE" -C "$TMPDIR" jarvis_db.sql
|
||||||
SIZE=$(du -sh "$OUTFILE" | cut -f1)
|
SIZE=$(du -sh "$OUTFILE" | cut -f1)
|
||||||
echo "[$(date)] Backup OK: $OUTFILE ($SIZE)" >> "$LOG"
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Backup OK: $(basename "$OUTFILE") ($SIYE)" >> "$LOG"
|
||||||
else
|
else
|
||||||
echo "[$(date)] ERROR: mysqldump failed" >> "$LOG"
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] ERROR: mysqldump failed" >> "$LOG"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 7-day retention
|
find "$BACKUP_DIR" -name "jarvis_backup_*.tar.gz" -mtime +7 -delete
|
||||||
find "$BACKUP_DIR" -name "${DB_NAME}_*.sql.gz" -mtime +7 -delete
|
COUNT=$(ls "$BACKUP_DIR"/jarvis_backup_*.tar.gz 2>/dev/null | wc -l)
|
||||||
echo "[$(date)] Cleanup done. Files kept: $(ls $BACKUP_DIR | wc -l)" >> "$LOG"
|
echo "[$(date '+%Y-%m-%d %H:%M:%S')] Done. Files retained: $COUNT" >> "$LOG"
|
||||||
Reference in New Issue
Block a user