From d84efbfaa4b9afe86f8339204f5efacb1b7f393f Mon Sep 17 00:00:00 2001
From: vincent <vfebvre@cadoles.com>
Date: Fri, 15 Feb 2019 11:04:05 +0100
Subject: [PATCH] =?UTF-8?q?retour=20au=20sauvegarde=20Bareos=20pour=20inco?=
 =?UTF-8?q?mpatibilit=C3=A9=20Xtrabackup,=20personnalisation=20des=20sauve?=
 =?UTF-8?q?gardes=20pour=20MaraiDB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 schedule_extra/{01_mysql.xml => 01_mariadb.xml} | 6 +++---
 schedule_scripts/{mysql => mariadb}             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename schedule_extra/{01_mysql.xml => 01_mariadb.xml} (74%)
 rename schedule_scripts/{mysql => mariadb} (60%)

diff --git a/schedule_extra/01_mysql.xml b/schedule_extra/01_mariadb.xml
similarity index 74%
rename from schedule_extra/01_mysql.xml
rename to schedule_extra/01_mariadb.xml
index cd4118c..0d6fdf9 100644
--- a/schedule_extra/01_mysql.xml
+++ b/schedule_extra/01_mariadb.xml
@@ -2,14 +2,14 @@
 
 <creole>
     <variables>
-        <family name="mysql" description="Exportation des bases de données MySQL">
-            <variable name="description" type="string" hidden="True"><value>Exportation des bases MySQL</value></variable>
+        <family name="mariadb" description="Exportation des bases de données MariaDB">
+            <variable name="description" type="string" hidden="True"><value>Exportation des bases MariaDB</value></variable>
             <variable name="day" type="schedule" description="Périodicité d'exécution"><value>daily</value></variable>
             <variable name="mode" type="schedulemod" hidden="True"><value>pre</value></variable>
         </family>
     </variables>
     <constraints>
-        <fill name='calc_multi_condition' target='schedule.mysql.day'>
+        <fill name='calc_multi_condition' target='schedule.mariadb.day'>
             <param>non</param>
 	    <param type='eole' name='condition_1'>dbEnableBackup</param>
             <param name='match'>none</param>
diff --git a/schedule_scripts/mysql b/schedule_scripts/mariadb
similarity index 60%
rename from schedule_scripts/mysql
rename to schedule_scripts/mariadb
index 06b3ff9..0dda3ea 100644
--- a/schedule_scripts/mysql
+++ b/schedule_scripts/mariadb
@@ -2,7 +2,7 @@
 
 set -e
 
-DESC="Exportation des bases MySQL"
+DESC="Exportation des bases MariaDB"
 
 . /usr/share/eole/schedule/config.sh
 
@@ -12,7 +12,7 @@ OPTION="--lock-tables"
 rm -f $MYSQLSAVDIR/*.sql
 mkdir -p $MYSQLSAVDIR
 
-CMD="mysql --defaults-file=/etc/mysql/mariadb.cnf -e 'show databases' | grep -v '^Database$'"
+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
@@ -20,7 +20,7 @@ for databasename in $DATABASES; do
             continue
             ;;
         *)
-            CMD="mysqldump --defaults-file=/etc/mysql/mariadb.cnf --databases $databasename --flush-privileges --create-options -Q -c $OPTION 2>/dev/null"
+            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