diff --git a/batch_files/docker-backup_files/correct_docker-backup.sh b/batch_files/docker-backup_files/correct_docker-backup.sh new file mode 100755 index 0000000..030160f --- /dev/null +++ b/batch_files/docker-backup_files/correct_docker-backup.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +SRC_SCRIPT="${SCRIPT_DIR}/docker-backup.sh" +DEST_DIR="/root/docker" +DEST_SCRIPT="${DEST_DIR}/docker-backup.sh" +CRON_JOB_FILE="/etc/cron.d/docker-backup" +LOG_FILE="/var/log/docker_backup.log" + +if [[ "${EUID}" -ne 0 ]]; then + echo "Run this script as root." + exit 1 +fi + +mkdir -p "${DEST_DIR}" + +install -m 755 "${SRC_SCRIPT}" "${DEST_SCRIPT}" +echo "Installed ${DEST_SCRIPT}" + +cat > "${CRON_JOB_FILE}" <> ${LOG_FILE} 2>&1 +EOF + +chmod 644 "${CRON_JOB_FILE}" +echo "Installed ${CRON_JOB_FILE}" +echo "Docker backups will run every 12 hours." diff --git a/batch_files/docker-backup_files/docker-backup.sh b/batch_files/docker-backup_files/docker-backup.sh index c1bfe7c..a19cb8f 100644 --- a/batch_files/docker-backup_files/docker-backup.sh +++ b/batch_files/docker-backup_files/docker-backup.sh @@ -6,7 +6,8 @@ set -euo pipefail # ========================= # Backup destination -BACKUP_BASE="/mnt/backup/docker-backups" +HOSTNAME="$(hostname -s)" +BACKUP_BASE="/mnt/naspublic/docker-backups/${HOSTNAME}" # What to back up SOURCE_PATHS=( @@ -30,14 +31,20 @@ COMPOSE_DIRS=( "/home/traver/docker" ) -# Timestamp -TIMESTAMP="$(date '+%Y-%m-%d_%H-%M-%S')" -BACKUP_DIR="${BACKUP_BASE}/${TIMESTAMP}" +# Date/time foldering +DATE_STAMP="$(date '+%Y-%m-%d')" +TIME_STAMP="$(date '+%H-%M-%S')" +BACKUP_DIR="${BACKUP_BASE}/${DATE_STAMP}" log() { echo "[$(date '+%F %T')] $*" | tee -a "$LOG_FILE" } +archive_name_for_path() { + local path="$1" + echo "${path#/}" | tr '/' '_' +} + start_containers() { log "Starting Docker Compose stacks..." for dir in "${COMPOSE_DIRS[@]}"; do @@ -69,6 +76,27 @@ cleanup_old_backups() { find "$BACKUP_BASE" -mindepth 1 -maxdepth 1 -type d -mtime +"$RETENTION_DAYS" -exec rm -rf {} \; >>"$LOG_FILE" 2>&1 || true } +create_archive() { + local path="$1" + local archive_name + local archive_path + local parent_dir + local base_name + + if [[ ! -e "$path" ]]; then + log "Warning: source path missing: $path" + return 0 + fi + + archive_name="$(archive_name_for_path "$path")" + archive_path="${BACKUP_DIR}/${TIME_STAMP}_${archive_name}.tar.gz" + parent_dir="$(dirname "$path")" + base_name="$(basename "$path")" + + log "Creating archive ${archive_path} from ${path}" + tar --xattrs --acls --numeric-owner -czpf "$archive_path" -C "$parent_dir" "$base_name" >>"$LOG_FILE" 2>&1 +} + main() { log "========================================" log "Starting Docker backup" @@ -76,22 +104,14 @@ main() { mkdir -p "$BACKUP_BASE" mkdir -p "$BACKUP_DIR" - for path in "${SOURCE_PATHS[@]}"; do - if [[ ! -e "$path" ]]; then - log "Warning: source path missing: $path" - fi - done - if [[ "$STOP_CONTAINERS" == "true" ]]; then stop_containers fi - log "Running rsync backup to $BACKUP_DIR" - rsync -aHAX --delete \ - /root/docker \ - /home/traver/docker \ - /var/lib/docker/volumes \ - "$BACKUP_DIR"/ >>"$LOG_FILE" 2>&1 + log "Creating separate compressed backups in $BACKUP_DIR" + for path in "${SOURCE_PATHS[@]}"; do + create_archive "$path" + done log "Backup sizes:" du -sh "$BACKUP_DIR" >>"$LOG_FILE" 2>&1 || true @@ -106,4 +126,4 @@ main() { log "========================================" } -main "$@" \ No newline at end of file +main "$@" diff --git a/batch_files/docker-backup_files/setup_docker-backup.sh b/batch_files/docker-backup_files/setup_docker-backup.sh old mode 100644 new mode 100755 index 1f32d35..99ef7dd --- a/batch_files/docker-backup_files/setup_docker-backup.sh +++ b/batch_files/docker-backup_files/setup_docker-backup.sh @@ -1,31 +1,27 @@ -#!/bin/bash +#!/usr/bin/env bash +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # --- CONFIG --- -SRC_SCRIPT="./docker-backup.sh" -DEST_SCRIPT="/root/docker/docker-backup.sh" +SRC_SCRIPT="${SCRIPT_DIR}/docker-backup.sh" +DEST_DIR="/root/docker" +DEST_SCRIPT="${DEST_DIR}/docker-backup.sh" CRON_JOB_FILE="/etc/cron.d/docker-backup" -LOG_FILE="/var/log/docker-backup-log" +LOG_FILE="/var/log/docker_backup.log" -# --- ENSURE /root/docker EXISTS --- -mkdir -p /root/docker +mkdir -p "${DEST_DIR}" -# --- COPY OR REPLACE SCRIPT --- -cp "${SRC_SCRIPT}" "${DEST_SCRIPT}" || { - echo "❌ Failed to copy ${SRC_SCRIPT} to ${DEST_SCRIPT}" - exit 1 -} +install -m 755 "${SRC_SCRIPT}" "${DEST_SCRIPT}" +echo "Installed ${DEST_SCRIPT}" -chmod +x "${DEST_SCRIPT}" -echo "✅ Script installed to ${DEST_SCRIPT} and made executable." - -# --- WRITE CRON JOB WITH RANDOM DELAY UP TO 2 HOURS --- cat > "${CRON_JOB_FILE}" <> ${LOG_FILE} 2>&1 +# Run every 12 hours +0 */12 * * * root ${DEST_SCRIPT} >> ${LOG_FILE} 2>&1 EOF chmod 644 "${CRON_JOB_FILE}" -echo "✅ Cron job installed in ${CRON_JOB_FILE}" \ No newline at end of file +echo "Installed ${CRON_JOB_FILE}"