From 4268c8f0ed4aa382e949d835746caccf9898e5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Tue, 7 Feb 2017 10:19:53 +0100 Subject: [PATCH 1/4] mongodump with --quiet. Not std{err,out} redirection! --- docs/zzz_evobackup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index bc42b2c..d9f7614 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -108,7 +108,7 @@ mkdir -p -m 700 /home/backup ## don't forget to create use with read-only access ## > use admin ## > db.createUser( { user: "mongobackup", pwd: "PASS", roles: [ "backup", ] } ) -# mongodump -u mongobackup -pPASS -o /home/backup/mongodump/ >/dev/null 2>&1 |grep -v "^connected to:" +# mongodump --quiet -u mongobackup -pPASS -o /home/backup/mongodump/ ## Redis : example with copy .rdb file # cp /var/lib/redis/dump.rdb /home/backup/ From a03dc4e3784a11db8fd671443efac43186345ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Tue, 7 Feb 2017 15:26:22 +0100 Subject: [PATCH 2/4] Check exit code of mongodump. --- docs/zzz_evobackup | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/zzz_evobackup b/docs/zzz_evobackup index d9f7614..7c54cdf 100755 --- a/docs/zzz_evobackup +++ b/docs/zzz_evobackup @@ -109,6 +109,9 @@ mkdir -p -m 700 /home/backup ## > use admin ## > db.createUser( { user: "mongobackup", pwd: "PASS", roles: [ "backup", ] } ) # mongodump --quiet -u mongobackup -pPASS -o /home/backup/mongodump/ +# if [ $? -ne 0 ]; then +# echo "Error with mongodump!" +# fi ## Redis : example with copy .rdb file # cp /var/lib/redis/dump.rdb /home/backup/ From 49c811432e52fb9b19bb1999a0d9d9ba548b5a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S=C3=89RIE?= Date: Thu, 9 Feb 2017 09:48:38 +0100 Subject: [PATCH 3/4] Removed username. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8229ac5..18395ba 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ 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. ~~~ -git clone https://vlaborie@forge.evolix.org/evobackup.git +git clone https://forge.evolix.org/evobackup.git cd evobackup man ./docs/bkctld.8 -~~~ \ No newline at end of file +~~~ From d35c37dd6e62861924e65a77ae5e2651faf37335 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Thu, 9 Feb 2017 15:24:55 +0100 Subject: [PATCH 4/4] Print all IP on bkctld status (Fix #2135) --- bkctld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bkctld b/bkctld index bb5344d..8272518 100755 --- a/bkctld +++ b/bkctld @@ -362,7 +362,7 @@ sub_status() { status="OFF" fi port=$(get_port $jail) - ip=$(get_ip $jail|xargs) + ip=$(get_ip $jail|xargs|tr -s ' ' ',') echo "$jail $status $port $inc $ip" | awk '{ printf("%- 30s %- 10s %- 10s %- 10s %- 40s\n", $1, $2, $3, $4, $5); }' }