diff --git a/Docker_backup/README.md b/Docker_backup/README.md index 49275c7..c91b486 100644 --- a/Docker_backup/README.md +++ b/Docker_backup/README.md @@ -7,13 +7,16 @@ This directory contains the Docker backup scripts for this repository. - `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. +- `update_docker-backup.sh` replaces previously installed backup scripts on a system and refreshes the cron job. ## Usage - Review the scripts before running them. - Run the install or correction scripts as `root`. +- Run `update_docker-backup.sh` as `root` on existing systems to replace older installed copies. - 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 set includes `/root/docker`, `/opt/docker`, `/var/lib/docker/volumes`, and `/home/traver/docker`. - The backup job runs every 3 hours. - Backups older than 14 days are removed automatically. diff --git a/Docker_backup/correct_docker-backup.sh b/Docker_backup/correct_docker-backup.sh index 9f73fb9..7e24201 100755 --- a/Docker_backup/correct_docker-backup.sh +++ b/Docker_backup/correct_docker-backup.sh @@ -3,12 +3,17 @@ 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" CRON_MATCH='docker-backup\.sh|docker_backup\.log|docker-backup-log' +FILES_TO_INSTALL=( + "docker-backup.sh" + "setup_docker-backup.sh" + "correct_docker-backup.sh" + "update_docker-backup.sh" +) if [[ "${EUID}" -ne 0 ]]; then echo "Run this script as root." @@ -41,8 +46,15 @@ remove_legacy_cron_jobs mkdir -p "${DEST_DIR}" -install -m 755 "${SRC_SCRIPT}" "${DEST_SCRIPT}" -echo "Installed ${DEST_SCRIPT}" +install_scripts() { + local file + for file in "${FILES_TO_INSTALL[@]}"; do + install -m 755 "${SCRIPT_DIR}/${file}" "${DEST_DIR}/${file}" + echo "Installed ${DEST_DIR}/${file}" + done +} + +install_scripts cat > "${CRON_JOB_FILE}" < "${CRON_JOB_FILE}" </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 +} + +install_scripts() { + local file + mkdir -p "${DEST_DIR}" + + for file in "${FILES_TO_INSTALL[@]}"; do + install -m 755 "${SCRIPT_DIR}/${file}" "${DEST_DIR}/${file}" + echo "Installed ${DEST_DIR}/${file}" + done +} + +install_cron_job() { + cat > "${CRON_JOB_FILE}" <> ${LOG_FILE} 2>&1 +EOF + + chmod 644 "${CRON_JOB_FILE}" + echo "Installed ${CRON_JOB_FILE}" +} + +remove_legacy_cron_jobs +install_scripts +install_cron_job +echo "Docker backup scripts were updated and the 3-hour cron job was refreshed." diff --git a/batch_files/Map Drives.bat b/batch_files/Map Drives.bat index 47d4a16..9eca5c8 100644 --- a/batch_files/Map Drives.bat +++ b/batch_files/Map Drives.bat @@ -10,6 +10,5 @@ net use r: /delete net use s: /delete net use w: \\nas\public -net use s: \\nas\downloadedmedia net use r: \\nas\downloads -net use t: \\NAS\public-share2 \ No newline at end of file +net use t: \\NAS\public2 \ No newline at end of file