Merge branch '2.7.0/master' into dist/eole/2.7.0/master

debian/control

@@ -10,7 +10,7 @@ Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-mariadb
 
 Package: eole-mariadb
 Architecture: all
-Depends: ${misc:Depends}, mariadb-server
+Depends: ${misc:Depends}, mariadb-server, mariadb-backup
 Conflicts: eole-mysql
 Provides: eole-mysql
 Description: Dictionnaires et templates pour la configuration d'un serveur MariaDB, testée uniquement avec eolebase

schedule/scripts/mariadb

@@ -9,19 +9,11 @@ DESC="Exportation des bases MariaDB"
 MYSQLSAVDIR=$SAVDIR/sql
 OPTION="--lock-tables"
 
-rm -f $MYSQLSAVDIR/*.sql || true
+if [[ -d ${MYSQLSAVDIR} ]] 
-mkdir -p $MYSQLSAVDIR
+then 
+   rm -rf ${MYSQLSAVDIR}
+   mkdir -p ${MYSQLSAVDIR}
+fi
 
-DATABASES=$(mysql --defaults-file=/etc/mysql/mariadbBackup.cnf -e 'show databases' | grep -v '^Database$')
+mariabackup --defaults-file=/etc/mysql/debian.cnf --backup --target-dir=$MYSQLSAVDIR
-for databasename in $DATABASES; do
+exit $?
-    case "$databasename" in
-        information_schema|performance_schema|bareos)
-            continue
-            ;;
-        *)
-            mysqldump --defaults-file=/etc/mysql/mariadbBackup.cnf --databases $databasename --flush-privileges --create-options -Q -c $OPTION 2>/dev/null > $MYSQLSAVDIR/$databasename.sql
-            ;;
-    esac
-done
-
-exit 0