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

postservice/25-bdd-admin

@@ -28,8 +28,6 @@ then
 
     previousUsers=($(awk -F ':' '{print $1}' ${readerfile} ))
 
-    index=0
-
     for user in ${accounts[@]}
     do
         PASS=$(awk -F ':' "/${user}:/ {print \$2}" ${readerfile})
@@ -56,6 +54,7 @@ then
             done
         fi
 
+        index=0
         for hst in ${hostsList[@]}
         do
             SQL="DROP USER IF EXISTS '${user}'@'${hst}';"
@@ -87,3 +86,4 @@ then
 fi
 
 exit 0
+

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 || true
-mkdir -p $MYSQLSAVDIR
-
-DATABASES=$(mysql --defaults-file=/etc/mysql/debian.cnf -e 'show databases' | grep -v '^Database$')
-for databasename in $DATABASES; do
-    case "$databasename" in
-        information_schema|performance_schema|bareos)
-            continue
-            ;;
-        *)
-            mysqldump --defaults-file=/etc/mysql/debian.cnf --databases $databasename --flush-privileges --create-options -Q -c $OPTION > $MYSQLSAVDIR/$databasename.sql
-            ;;
-    esac
-done
-
-exit 0

schedule_config/config.sh

@@ -0,0 +1,7 @@
+# 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

@@ -0,0 +1,27 @@
+#!/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