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

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+DESC="Exportation des bases MariaDB"
+
+. /usr/share/eole/schedule/config.sh
+
+MYSQLSAVDIR=$SAVDIR/sql
+OPTION="--lock-tables"
+
+if [[ -d ${MYSQLSAVDIR} ]] 
+then 
+   rm -rf ${MYSQLSAVDIR}
+   mkdir -p ${MYSQLSAVDIR}
+fi
+
+mariabackup --defaults-file=/etc/mysql/debian.cnf --backup --target-dir=$MYSQLSAVDIR
+exit $?

schedule_config/config.sh

@@ -1,7 +0,0 @@
-# Configuration commune aux scripts schedule
-# Configuration de base modifiée pour copier dans le partage nfs plutôt que /home
-
-SAVDIR=/mnt/sauvegardes/
-# pour que l'affichage de [ ok ] soit ok
-export TERM='dumb'
-umask 0077

schedule_scripts/mariadb

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-DESC="Exportation des bases MariaDB"
-
-. /usr/share/eole/schedule/config.sh
-
-MYSQLSAVDIR=$SAVDIR/sql
-OPTION="--lock-tables"
-
-rm -f $MYSQLSAVDIR/*.sql
-mkdir -p $MYSQLSAVDIR
-
-CMD="mysql --defaults-file=/etc/mysql/mariadbBackup.cnf -e 'show databases' | grep -v '^Database$'"
-DATABASES=$(CreoleRun "$CMD" mysql)
-for databasename in $DATABASES; do
-    case "$databasename" in
-        information_schema|performance_schema|bareos)
-            continue
-            ;;
-        *)
-            CMD="mysqldump --defaults-file=/etc/mysql/mariadbBackup.cnf --databases $databasename --flush-privileges --create-options -Q -c $OPTION 2>/dev/null"
-            CreoleRun "$CMD" mysql > $MYSQLSAVDIR/$databasename.sql
-            ;;
-    esac
-done