From eb96fd41b270e4f0b5bc3479955e7733128f00db Mon Sep 17 00:00:00 2001
From: Jeremy Dubois <jdubois@evolix.fr>
Date: Fri, 25 Mar 2022 18:09:08 +0100
Subject: [PATCH] base: zzz_evobackup upstream release 22.03

---
 CHANGELOG                      |  1 +
 roles/base/files/zzz_evobackup | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9728078..d31e01f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - accounts: use "evobsd_internal_group" for SSH authentication
 - evocheck : imported version 22.03
+- base: zzz_evobackup upstream release 22.03
 
 ### Fixed
 
diff --git a/roles/base/files/zzz_evobackup b/roles/base/files/zzz_evobackup
index d39c40a..e7fc3dc 100755
--- a/roles/base/files/zzz_evobackup
+++ b/roles/base/files/zzz_evobackup
@@ -20,7 +20,7 @@ set -u
 
 ##### Configuration ###################################################
 
-VERSION="22.01"
+VERSION="22.03"
 
 # email adress for notifications
 MAIL=jdoe@example.com
@@ -191,6 +191,9 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
     # mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/
     # pt-show-grants --flush --no-header > ${LOCAL_BACKUP_DIR}/mysql/all_grants.sql
 
+    # Dump all variables
+    # mysql -A -e"SHOW GLOBAL VARIABLES;" > ${LOCAL_BACKUP_DIR}/MySQLCurrentSettings.txt
+
     ## example with SQL dump (schema only, no data) for each databases
     # mkdir -p -m 700 ${LOCAL_BACKUP_DIR}/mysql/
     # for i in $(mysql --defaults-extra-file=/etc/mysql/debian.cnf -P 3306 -e 'show databases' -s --skip-column-names \
@@ -228,9 +231,9 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
     ## PostgreSQL
 
     ## Purge previous dumps
-    # rm ${LOCAL_BACKUP_DIR}/pg.*.gz
-    # rm ${LOCAL_BACKUP_DIR}/pg-backup.tar
-    # rm ${LOCAL_BACKUP_DIR}/postgresql/*
+    # rm -rf ${LOCAL_BACKUP_DIR}/pg.*.gz
+    # rm -rf ${LOCAL_BACKUP_DIR}/pg-backup.tar
+    # rm -rf ${LOCAL_BACKUP_DIR}/postgresql/*
     ## example with pg_dumpall (warning: you need space in ~postgres)
     # su - postgres -c "pg_dumpall > ~/pg.dump.bak"
     # mv ~postgres/pg.dump.bak ${LOCAL_BACKUP_DIR}/
@@ -364,7 +367,7 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
         fi
     else
         if [ -n "${backup_server_state_bin}" ]; then
-            ${backup_server_state_bin} --force --backup-dir "${server_state_dir}"
+            ${backup_server_state_bin} --etc --force --backup-dir "${server_state_dir}"
         else
             mkdir -p "${server_state_dir}"