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

dicos/25_bdd_server.xml

@@ -49,13 +49,7 @@
                 <value>Default</value>
             </variable>
             <variable name="accLimitTarget" type="string" description="Restriction d'accès à ces IP/noms d'hôtes (liste séparateur séparateur ',')" />
-            <variable name="create_db" type='oui/non' description="Créer des bases de données">
-                <value>non</value>
-            </variable>
-        </family>
-        <family name="MariaDB Databases">
-            <variable name="db_name" type='string' description='Nom de la base de donnée' multi="True"/>
-            <variable name="db_admin_user" type='string' description="Nom de l'utilisateur gestionnaire de la base de données"/>
+
         </family>
 
         <!-- Tunning -->
@@ -141,11 +135,10 @@
         </family>
         <separators>
             <separator name='dbCreateFixAdmin'>Comptes d'administration supplémentaires</separator>
-            <separator name='create_db'>Ajouter des bases de données</separator>
         </separators>
     </variables>
     <constraints>
-        <check name="valid_ipnetmask" target="maskMariaDBLimit" level="warning">
+	<check name="valid_ipnetmask" target="maskMariaDBLimit" level="warning">
             <param type='eole'>ipMariaDBLimit</param>
         </check>	
 
@@ -174,10 +167,6 @@
            <slave>ifMariaDBLimit</slave>
         </group>
 
-        <group master='db_name'>
-            <slave>db_admin_user</slave>
-        </group>
-
         <fill name='calc_multi_condition' target='accLimitTarget'>
             <param>Default</param>
             <param type='eole' name='condition_1'>accLimits</param>
@@ -196,11 +185,6 @@
             <target type='servicelist'>bdd</target>
         </condition>
 
-        <condition name='disabled_if_in' source='create_db'>
-            <param>non</param>
-            <target type='family'>MariaDB Databases</target>
-        </condition>
-
         <condition name='disabled_if_in' source="dbCreateFixAdmin">
             <param>non</param>
             <target type='variable'>accName</target>

schedule/scripts/mariadb

@@ -9,11 +9,9 @@ DESC="Exportation des bases MariaDB"
 MYSQLSAVDIR=$SAVDIR/sql
 OPTION="--lock-tables"
 
-if [[ -d ${MYSQLSAVDIR} ]] 
-then 
-   rm -rf ${MYSQLSAVDIR}
-   mkdir -p ${MYSQLSAVDIR}
-fi
+rm -f $MYSQLSAVDIR/*.sql || true
+mkdir -p $MYSQLSAVDIR
 
 mariabackup --defaults-file=/etc/mysql/debian.cnf --backup --target-dir=$MYSQLSAVDIR
-exit $?
+
+exit 0