From 3549428b20b7dbf2aa2eebb00de498cd3b84c36b Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 29 Apr 2021 12:54:29 +0100 Subject: [PATCH 1/2] backup: sync rsnapshot.conf with backup server Sync `rsnapshot.conf` with what is currently running on the backup server: `ssh backup cat /opt/local/etc/rsnapshot.conf > rsnapshot.conf` --- backup/rsnapshot.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backup/rsnapshot.conf b/backup/rsnapshot.conf index e325e86e2..8b1150cf1 100644 --- a/backup/rsnapshot.conf +++ b/backup/rsnapshot.conf @@ -8,7 +8,7 @@ cmd_logger /usr/bin/logger retain daily 7 retain weekly 4 -retain monthly 12 +retain monthly 6 verbose 2 loglevel 3 @@ -21,6 +21,5 @@ ssh_args -p 22 -i /root/.ssh/nodejs_build_backup cmd_preexec /root/backup_scripts/dist.sh backup root@ci.nodejs.org:/var/lib/jenkins/ ci.nodejs.org/ +rsync_long_args=--exclude "workspace*" backup root@ci-release.nodejs.org:/var/lib/jenkins/ ci-release.nodejs.org/ +rsync_long_args=--exclude "workspace*" -backup root@nodejs-www:/var/log/nginx/ www-logs/ +rsync_long_args=--exclude "*.log" --exclude "old/*" -backup_script /root/backup_scripts/benchmark_mysql.sh benchmark/ +backup root@direct.nodejs.org:/var/log/nginx/ www-logs/ +rsync_long_args=--exclude "*.log" --exclude "old/*" backup_script /root/backup_scripts/iptables.sh iptables/ From dfa56bf503f2079c8c8c2ef2770102c56744db6f Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 29 Apr 2021 12:59:24 +0100 Subject: [PATCH 2/2] backup: add backup for /etc/ Adds backup of `/etc/` to `etc//`. The existing backups of `/var/lib/jenkins/` are left in `/` to avoid creating new inodes for unchanged files/directories. --- backup/README.md | 4 +++- backup/rsnapshot.conf | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backup/README.md b/backup/README.md index 3e0584a47..03c58232c 100644 --- a/backup/README.md +++ b/backup/README.md @@ -8,16 +8,18 @@ currently being backed up. - ci.nodejs.org: - full backup of /var/lib/jenkins (rotated, excluding workdirs) + - full backup of /etc (rotated) - iptables rules (rotated) - ci-release.nodejs.org: - full backup of /var/lib/jenkins (rotated, excluding workdirs) + - full backup of /etc (rotated) - iptables rules (rotated) - - iojs-softlayer-benchmark: mysql dump (rotated) - nodejs-www: - /home/dist/iojs: all artifacts for iojs.org (static, no deletion) - /home/dist/nodejs: all artifacts for nodejs.org (static, no deletion) - /home/libuv/www/dist: all artifacts for libuv.org (static, no deletion) - /var/log/nginx: all logs for nodejs, iojs and libuv (rotated) + - full backup of /etc (rotated) ### Folder structure diff --git a/backup/rsnapshot.conf b/backup/rsnapshot.conf index 8b1150cf1..f43d8a0a7 100644 --- a/backup/rsnapshot.conf +++ b/backup/rsnapshot.conf @@ -21,5 +21,8 @@ ssh_args -p 22 -i /root/.ssh/nodejs_build_backup cmd_preexec /root/backup_scripts/dist.sh backup root@ci.nodejs.org:/var/lib/jenkins/ ci.nodejs.org/ +rsync_long_args=--exclude "workspace*" backup root@ci-release.nodejs.org:/var/lib/jenkins/ ci-release.nodejs.org/ +rsync_long_args=--exclude "workspace*" +backup root@ci.nodejs.org:/etc/ etc/ci.nodejs.org/ +backup root@ci-release.nodejs.org:/etc/ etc/ci-release.nodejs.org/ +backup root@direct.nodejs.org:/etc/ etc/nodejs.org/ backup root@direct.nodejs.org:/var/log/nginx/ www-logs/ +rsync_long_args=--exclude "*.log" --exclude "old/*" backup_script /root/backup_scripts/iptables.sh iptables/