From 7b9f834e4ac7d364589a25eabb1a860e46017b35 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Fri, 1 Sep 2017 12:23:13 +0200 Subject: [PATCH 1/8] Fix bashims amd deprecated backquote in sample script --- docs/zzz_evobackup | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index ef465ec..9e765fb 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -82,11 +82,9 @@ mkdir -p -m 700 /home/backup # mysqlhotcopy BASE /home/mysqlhotcopy/ ## example for multiples MySQL instances -# mysqladminpasswd=`cat /root/.my.cnf |grep -m1 'password = .*' |cut -d" " -f3` +# mysqladminpasswd=$(grep -m1 'password = .*' /root/.my.cnf|cut -d" " -f3) # grep -E "^port\s*=\s*\d*" /etc/mysql/my.cnf |while read instance; do -# instance=$(echo $instance |tr -d '\t') -# instance=${instance// /} -# instance=${instance//port=/} +# instance=$(echo "$instance"|awk '{ print $3 }') # if [ "$instance" != "3306" ] # then # mysqldump -P $instance --opt --all-databases --hex-blob -u mysqladmin -p$mysqladminpasswd > /home/backup/mysql.$instance.bak @@ -140,7 +138,7 @@ mkdir -p -m 700 /home/backup ## Dump MBR / table partitions with dd and sfdisk ## Linux -#for disk in $(ls /dev/{s,v}d[a-z] 2>/dev/null); do +#for disk in $(ls /dev/[sv]d[a-z] 2>/dev/null); do # name=$(basename $disk) # dd if=$disk of=/home/backup/MBR-$name bs=512 count=1 2>&1 | egrep -v "(records in|records out|512 bytes)" # fdisk -l $disk > /home/backup/partitions-$name From ade9cd0e7c2982e069a3924091c377ea94ef9462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Thu, 7 Sep 2017 09:57:26 +0200 Subject: [PATCH 2/8] When doing `cd -`, redirect stdout Because, `cd -` will displays on stdout the path... And we want only errors in the cron output. --- docs/zzz_evobackup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index 9e765fb..a6cf037 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -99,7 +99,7 @@ mkdir -p -m 700 /home/backup ## another method with gzip directly piped # cd /var/lib/postgresql # sudo -u postgres pg_dumpall | gzip > /home/backup/pg.dump.bak.gz -# cd - +# cd - > /dev/null ## example with all tables from MYBASE excepts TABLE1 and TABLE2 # pg_dump -p 5432 -h 127.0.0.1 -U USER --clean -F t --inserts -f /home/backup/pg-backup.tar -t 'TABLE1' -t 'TABLE2' MYBASE From 5c8e46491a159aef426d8018bc32d81486b3f25a Mon Sep 17 00:00:00 2001 From: Daniel Jakots Date: Thu, 7 Sep 2017 11:05:05 -0400 Subject: [PATCH 3/8] group things that need to be changed --- docs/zzz_evobackup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index a6cf037..ddf9047 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -33,12 +33,12 @@ trap "rm -f $PIDFILE" EXIT # port SSH SSH_PORT=2XXX -# choose "linux" or "bsd" -SYSTEM=$(uname | tr '[:upper:]' '[:lower:]') - # email adress for notifications MAIL=jdoe@example.com +# choose "linux" or "bsd" +SYSTEM=$(uname | tr '[:upper:]' '[:lower:]') + # Variable to choose different backup server with date NODE=$(($(date +%d) % 2)) From d31bec4eb7bcd8f8491771b900f76a81f4c49a42 Mon Sep 17 00:00:00 2001 From: Daniel Jakots Date: Thu, 7 Sep 2017 11:05:34 -0400 Subject: [PATCH 4/8] there's no /boot on OpenBSD --- docs/zzz_evobackup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index ddf9047..3891e2b 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -184,7 +184,7 @@ BEGINNING=$(/bin/date +"%d-%m-%Y ; %H:%M") if [ "$SYSTEM" = "linux" ]; then rep="/bin /boot /lib /opt /sbin /usr" else - rep="/bsd /bin /boot /sbin /usr" + rep="/bsd /bin /sbin /usr" fi rsync -avzh --stats --delete --delete-excluded --force --ignore-errors --partial \ From 7c04155fe8db4b7df590dc5b55512c8368909f80 Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Fri, 29 Sep 2017 09:51:17 +0200 Subject: [PATCH 5/8] add exclude for default php sessions path for Debian 9 --- docs/zzz_evobackup | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index 3891e2b..63698db 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -216,6 +216,7 @@ rsync -avzh --stats --delete --delete-excluded --force --ignore-errors --partial --exclude "/var/lib/amavis/tmp" \ --exclude "/var/lib/clamav/*.tmp" \ --exclude "/home/mysqltmp" \ + --exclude "/var/lib/php/sessions" \ $rep \ /etc \ /root \ From f7b8e96547fba21bffcc430188abefc486739c2a Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 9 Oct 2017 11:34:18 +0200 Subject: [PATCH 6/8] zzz_evobackup: fix arithmetics 09 % 2 is invalid --- docs/zzz_evobackup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index 63698db..be4070f 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -40,7 +40,7 @@ MAIL=jdoe@example.com SYSTEM=$(uname | tr '[:upper:]' '[:lower:]') # Variable to choose different backup server with date -NODE=$(($(date +%d) % 2)) +NODE=$(($(date +%e) % 2)) # serveur address for rsync SRV="node$NODE.backup.example.com" From 5819a00ada930f7ff747998513808c40022f77a6 Mon Sep 17 00:00:00 2001 From: Daniel Jakots Date: Mon, 13 Nov 2017 16:28:34 -0500 Subject: [PATCH 7/8] zzz_evobackup is not part of the documentation... --- docs/zzz_evobackup => zzz_evobackup | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/zzz_evobackup => zzz_evobackup (100%) diff --git a/docs/zzz_evobackup b/zzz_evobackup similarity index 100% rename from docs/zzz_evobackup rename to zzz_evobackup From 1b2491e2013cf47c63b00b888b019c69f9cc6045 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Mon, 4 Dec 2017 10:56:45 +0100 Subject: [PATCH 8/8] Fix docs and README for zzz_evobackup --- README.md | 2 +- docs/bkctld.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ecdd913..54fa37e 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ You can save various systems on evobackup jail : Linux, BSD, Windows, MacOSX. O rsync -av -e "ssh -p SSH_PORT" /home/ root@SERVER_NAME:/var/backup/home/ ~~~ -An example script is present in docs/zzz_evobackup, clone evobackup repo and read **CLIENT CONFIGURATION** section of the manual. +An example script is present in zzz_evobackup, clone evobackup repo and read **CLIENT CONFIGURATION** section of the manual. ~~~ git clone https://forge.evolix.org/evobackup.git diff --git a/docs/bkctld.8 b/docs/bkctld.8 index d5c6506..251378d 100644 --- a/docs/bkctld.8 +++ b/docs/bkctld.8 @@ -218,7 +218,7 @@ You can save various systems on evobackup jail : Linux, BSD, Windows, MacOSX. O rsync -av -e "ssh -p SSH_PORT" /home/ root@SERVER_NAME:/var/backup/home/ .PP .RE -You can simply create a shell script which use rsync for backup your's servers. An example script is available in docs/zzz_evobackup for quickstart. +You can simply create a shell script which use rsync for backup your's servers. An example script is available in zzz_evobackup for quickstart. .RE .PP This documentation explain how to use this example script.