From c739e246117bf9aaa1c34a200b1372f49165a344 Mon Sep 17 00:00:00 2001 From: WickedYoda <68271168+wickedyoda@users.noreply.github.com> Date: Sun, 15 Mar 2026 10:08:44 -0500 Subject: [PATCH 1/4] Update docker-run-netdata-install.sh --- updates_scripts/docker-run-netdata-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updates_scripts/docker-run-netdata-install.sh b/updates_scripts/docker-run-netdata-install.sh index d6f7aad..d383f92 100644 --- a/updates_scripts/docker-run-netdata-install.sh +++ b/updates_scripts/docker-run-netdata-install.sh @@ -1,6 +1,6 @@ docker run -d \ --name netdata \ - --hostname docker1 \ + --hostname docker3 \ --pid host \ --network host \ --restart unless-stopped \ From 160cabc734415bedba6c24c8a22cda065a99c1f2 Mon Sep 17 00:00:00 2001 From: WickedYoda <68271168+wickedyoda@users.noreply.github.com> Date: Wed, 18 Mar 2026 18:59:50 -0500 Subject: [PATCH 2/4] Fix Docker backup storage layout and 12-hour cron setup --- .../correct_docker-backup.sh | 32 +++++++++++ .../docker-backup_files/docker-backup.sh | 54 +++++++++++++------ .../setup_docker-backup.sh | 32 +++++------ 3 files changed, 83 insertions(+), 35 deletions(-) create mode 100755 batch_files/docker-backup_files/correct_docker-backup.sh mode change 100644 => 100755 batch_files/docker-backup_files/setup_docker-backup.sh 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}" From 1b5c15948c1447644a2f62a383d97f23595371c4 Mon Sep 17 00:00:00 2001 From: WickedYoda <68271168+wickedyoda@users.noreply.github.com> Date: Sat, 21 Mar 2026 17:42:39 -0500 Subject: [PATCH 3/4] Relocate Docker backup scripts and schedule 3-hour NAS backups --- Docker_backup/README.md | 19 ++++++++ .../correct_docker-backup.sh | 6 +-- .../docker-backup.sh | 43 ++++++++++++++++--- .../setup_docker-backup.sh | 9 +++- batch_files/docker-backup_files/README.md | 43 ------------------- 5 files changed, 66 insertions(+), 54 deletions(-) create mode 100644 Docker_backup/README.md rename {batch_files/docker-backup_files => Docker_backup}/correct_docker-backup.sh (84%) rename {batch_files/docker-backup_files => Docker_backup}/docker-backup.sh (71%) mode change 100644 => 100755 rename {batch_files/docker-backup_files => Docker_backup}/setup_docker-backup.sh (79%) delete mode 100644 batch_files/docker-backup_files/README.md diff --git a/Docker_backup/README.md b/Docker_backup/README.md new file mode 100644 index 0000000..49275c7 --- /dev/null +++ b/Docker_backup/README.md @@ -0,0 +1,19 @@ +# Docker_backup + +## Overview +This directory contains the Docker backup scripts for this repository. + +## Files +- `docker-backup.sh` backs up Docker data to the NAS share. +- `setup_docker-backup.sh` installs the backup script and cron job on a new system. +- `correct_docker-backup.sh` repairs older installs and rewrites the cron job. + +## Usage +- Review the scripts before running them. +- Run the install or correction scripts as `root`. +- Adjust paths if the target system uses different Docker or NAS mount locations. + +## Notes +- Backups are written to `/mnt/naspublic/docker-backup/{hostname}/{month}/{date}/`. +- The backup job runs every 3 hours. +- Backups older than 14 days are removed automatically. diff --git a/batch_files/docker-backup_files/correct_docker-backup.sh b/Docker_backup/correct_docker-backup.sh similarity index 84% rename from batch_files/docker-backup_files/correct_docker-backup.sh rename to Docker_backup/correct_docker-backup.sh index 030160f..5fabafd 100755 --- a/batch_files/docker-backup_files/correct_docker-backup.sh +++ b/Docker_backup/correct_docker-backup.sh @@ -23,10 +23,10 @@ cat > "${CRON_JOB_FILE}" <> ${LOG_FILE} 2>&1 +# Run every 3 hours +0 */3 * * * root ${DEST_SCRIPT} >> ${LOG_FILE} 2>&1 EOF chmod 644 "${CRON_JOB_FILE}" echo "Installed ${CRON_JOB_FILE}" -echo "Docker backups will run every 12 hours." +echo "Docker backups will run every 3 hours." diff --git a/batch_files/docker-backup_files/docker-backup.sh b/Docker_backup/docker-backup.sh old mode 100644 new mode 100755 similarity index 71% rename from batch_files/docker-backup_files/docker-backup.sh rename to Docker_backup/docker-backup.sh index a19cb8f..367bbfb --- a/batch_files/docker-backup_files/docker-backup.sh +++ b/Docker_backup/docker-backup.sh @@ -6,18 +6,19 @@ set -euo pipefail # ========================= # Backup destination +NAS_ROOT="/mnt/naspublic" HOSTNAME="$(hostname -s)" -BACKUP_BASE="/mnt/naspublic/docker-backups/${HOSTNAME}" +BACKUP_BASE="${NAS_ROOT}/docker-backup/${HOSTNAME}" # What to back up SOURCE_PATHS=( "/root/docker" - "/home/traver/docker" "/var/lib/docker/volumes" + "/home/traver/docker" ) # Retention in days -RETENTION_DAYS=7 +RETENTION_DAYS=14 # Log file LOG_FILE="/var/log/docker_backup.log" @@ -32,9 +33,10 @@ COMPOSE_DIRS=( ) # Date/time foldering +MONTH_STAMP="$(date '+%Y-%m')" DATE_STAMP="$(date '+%Y-%m-%d')" TIME_STAMP="$(date '+%H-%M-%S')" -BACKUP_DIR="${BACKUP_BASE}/${DATE_STAMP}" +BACKUP_DIR="${BACKUP_BASE}/${MONTH_STAMP}/${DATE_STAMP}" log() { echo "[$(date '+%F %T')] $*" | tee -a "$LOG_FILE" @@ -45,6 +47,29 @@ archive_name_for_path() { echo "${path#/}" | tr '/' '_' } +require_backup_target() { + if command -v mountpoint >/dev/null 2>&1; then + mountpoint -q "$NAS_ROOT" || { + log "Error: ${NAS_ROOT} is not mounted. Aborting backup." + exit 1 + } + return + fi + + if command -v findmnt >/dev/null 2>&1; then + findmnt -rn "$NAS_ROOT" >/dev/null 2>&1 || { + log "Error: ${NAS_ROOT} is not mounted. Aborting backup." + exit 1 + } + return + fi + + if [[ ! -d "$NAS_ROOT" ]]; then + log "Error: ${NAS_ROOT} is not mounted. Aborting backup." + exit 1 + fi +} + start_containers() { log "Starting Docker Compose stacks..." for dir in "${COMPOSE_DIRS[@]}"; do @@ -73,7 +98,8 @@ stop_containers() { cleanup_old_backups() { log "Removing backups older than ${RETENTION_DAYS} days from ${BACKUP_BASE}" - find "$BACKUP_BASE" -mindepth 1 -maxdepth 1 -type d -mtime +"$RETENTION_DAYS" -exec rm -rf {} \; >>"$LOG_FILE" 2>&1 || true + find "$BACKUP_BASE" -mindepth 2 -maxdepth 2 -type d -mtime +"$RETENTION_DAYS" -exec rm -rf {} + >>"$LOG_FILE" 2>&1 || true + find "$BACKUP_BASE" -mindepth 1 -maxdepth 1 -type d -empty -delete >>"$LOG_FILE" 2>&1 || true } create_archive() { @@ -94,13 +120,18 @@ create_archive() { 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 + if command -v pigz >/dev/null 2>&1; then + tar --xattrs --acls --numeric-owner -cpf - -C "$parent_dir" "$base_name" 2>>"$LOG_FILE" | pigz 2>>"$LOG_FILE" > "$archive_path" + else + tar --xattrs --acls --numeric-owner -czpf "$archive_path" -C "$parent_dir" "$base_name" >>"$LOG_FILE" 2>&1 + fi } main() { log "========================================" log "Starting Docker backup" + require_backup_target mkdir -p "$BACKUP_BASE" mkdir -p "$BACKUP_DIR" diff --git a/batch_files/docker-backup_files/setup_docker-backup.sh b/Docker_backup/setup_docker-backup.sh similarity index 79% rename from batch_files/docker-backup_files/setup_docker-backup.sh rename to Docker_backup/setup_docker-backup.sh index 99ef7dd..b7ac711 100755 --- a/batch_files/docker-backup_files/setup_docker-backup.sh +++ b/Docker_backup/setup_docker-backup.sh @@ -10,6 +10,11 @@ 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}" @@ -19,8 +24,8 @@ cat > "${CRON_JOB_FILE}" <> ${LOG_FILE} 2>&1 +# Run every 3 hours +0 */3 * * * root ${DEST_SCRIPT} >> ${LOG_FILE} 2>&1 EOF chmod 644 "${CRON_JOB_FILE}" diff --git a/batch_files/docker-backup_files/README.md b/batch_files/docker-backup_files/README.md deleted file mode 100644 index 7b98617..0000000 --- a/batch_files/docker-backup_files/README.md +++ /dev/null @@ -1,43 +0,0 @@ -<<<<<<< HEAD - # docker-backup_files - - ## Purpose - This directory contains files related to **docker backup files**. - - ## Contents - - `docker-backup.sh` -- `setup_docker-backup.sh` - - ## Usage - - Review each script or configuration file before running - - Some scripts may require **root or sudo** - - Paths and variables may need adjustment for your environment - - ## Notes - - This folder is part of the **public-setupfiles** repository - - Files are provided as-is for reference or automation - - ## Safety - Always back up data before running scripts that modify system state. -======= -# docker-backup_files - -## Overview -This directory is part of the **public-setupfiles** repository. -It contains scripts, configuration files, or resources related to **docker-backup_files**. - -## Usage -- Review scripts before execution -- Some files may require **root or sudo privileges** -- Paths, variables, or credentials may need customization - -## Logging & Output -Scripts may generate logs or output files in the same directory or system locations. - -## Safety Notes -- Always back up important data before running scripts -- Test in a non-production environment when possible -- Use at your own risk - ---- ->>>>>>> main From b5905ef1db27cef111f06eda7d36c8aa34a1b4db Mon Sep 17 00:00:00 2001 From: WickedYoda <68271168+wickedyoda@users.noreply.github.com> Date: Sat, 21 Mar 2026 17:50:10 -0500 Subject: [PATCH 4/4] Remove legacy Docker backup cron jobs during setup --- Docker_backup/correct_docker-backup.sh | 25 +++++++++++++++++++++++++ Docker_backup/setup_docker-backup.sh | 25 +++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/Docker_backup/correct_docker-backup.sh b/Docker_backup/correct_docker-backup.sh index 5fabafd..9f73fb9 100755 --- a/Docker_backup/correct_docker-backup.sh +++ b/Docker_backup/correct_docker-backup.sh @@ -8,12 +8,37 @@ 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" +CRON_MATCH='docker-backup\.sh|docker_backup\.log|docker-backup-log' if [[ "${EUID}" -ne 0 ]]; then echo "Run this script as root." exit 1 fi +remove_legacy_cron_jobs() { + local cron_file + while IFS= read -r cron_file; do + rm -f "$cron_file" + echo "Removed legacy cron file ${cron_file}" + done < <(grep -El "${CRON_MATCH}" /etc/cron.d/* 2>/dev/null || true) + + if [[ -f /etc/crontab ]] && grep -Eq "${CRON_MATCH}" /etc/crontab; then + grep -Ev "${CRON_MATCH}" /etc/crontab >/tmp/docker-backup-etc-crontab.cleaned || true + install -m 644 /tmp/docker-backup-etc-crontab.cleaned /etc/crontab + rm -f /tmp/docker-backup-etc-crontab.cleaned + echo "Removed legacy Docker backup entries from /etc/crontab" + fi + + if crontab -l -u root >/tmp/docker-backup-root-crontab 2>/dev/null; then + grep -Ev "${CRON_MATCH}" /tmp/docker-backup-root-crontab >/tmp/docker-backup-root-crontab.cleaned || true + crontab -u root /tmp/docker-backup-root-crontab.cleaned + rm -f /tmp/docker-backup-root-crontab /tmp/docker-backup-root-crontab.cleaned + echo "Removed legacy Docker backup entries from root crontab" + fi +} + +remove_legacy_cron_jobs + mkdir -p "${DEST_DIR}" install -m 755 "${SRC_SCRIPT}" "${DEST_SCRIPT}" diff --git a/Docker_backup/setup_docker-backup.sh b/Docker_backup/setup_docker-backup.sh index b7ac711..5565972 100755 --- a/Docker_backup/setup_docker-backup.sh +++ b/Docker_backup/setup_docker-backup.sh @@ -9,12 +9,37 @@ 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" +CRON_MATCH='docker-backup\.sh|docker_backup\.log|docker-backup-log' if [[ "${EUID}" -ne 0 ]]; then echo "Run this script as root." exit 1 fi +remove_legacy_cron_jobs() { + local cron_file + while IFS= read -r cron_file; do + rm -f "$cron_file" + echo "Removed legacy cron file ${cron_file}" + done < <(grep -El "${CRON_MATCH}" /etc/cron.d/* 2>/dev/null || true) + + if [[ -f /etc/crontab ]] && grep -Eq "${CRON_MATCH}" /etc/crontab; then + grep -Ev "${CRON_MATCH}" /etc/crontab >/tmp/docker-backup-etc-crontab.cleaned || true + install -m 644 /tmp/docker-backup-etc-crontab.cleaned /etc/crontab + rm -f /tmp/docker-backup-etc-crontab.cleaned + echo "Removed legacy Docker backup entries from /etc/crontab" + fi + + if crontab -l -u root >/tmp/docker-backup-root-crontab 2>/dev/null; then + grep -Ev "${CRON_MATCH}" /tmp/docker-backup-root-crontab >/tmp/docker-backup-root-crontab.cleaned || true + crontab -u root /tmp/docker-backup-root-crontab.cleaned + rm -f /tmp/docker-backup-root-crontab /tmp/docker-backup-root-crontab.cleaned + echo "Removed legacy Docker backup entries from root crontab" + fi +} + +remove_legacy_cron_jobs + mkdir -p "${DEST_DIR}" install -m 755 "${SRC_SCRIPT}" "${DEST_SCRIPT}"