Fix schedule backup script

Makefile

@@ -4,8 +4,8 @@
 
 SOURCE=eole-mariadb
 VERSION=0.0.1
-EOLE_VERSION=2.6
+EOLE_VERSION=2.7
-EOLE_RELEASE=2.6.2
+EOLE_RELEASE=2.7.1
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

README.md

@@ -1,5 +1,31 @@
 # eole-mariadb
 
+Paquet porté pour la 2.7.1. Les tests n'ont été réalisé que sur un Eolebase.
+
+La version utilisé est mariadb 10.3
+
+Ajout de ce paquet sur une 2.7.1 :
+
+## Add the Cadoles repository on all the nodes and the Leader
+
+  GenConfig  [Mode Expert] -> Dépôts Tiers
+
+ * Libellé du dépôt : Cadoles dev
+ * Déclaration du dépôt : deb [ arch=all ] https://vulcain.cadoles.com 2.7.1-dev main
+ * Méthode de récupération de la clé publique du dépôt : URL de la clé
+ * URL de la clé : https://vulcain.cadoles.com/cadoles.gpg
+
+## Add the MariaDB repository on all the nodes and the Leader
+
+GenConfig (Mode Expert) -> Dépôt tiers :
+ * Libellé du dépôt : MariaDB
+ * Déclaration du dépôt :  deb [ arch=amd64 ] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.3/ubuntu bionic main
+ * Méthode de récupération de la clé publique du dépôt : serveur de clés
+ * URL du serveur de clés : hkp://keyserver.ubuntu.com:80
+ * Empreinte de la clé : 0xF1656F24C74CD1D8
+
+#######################################################################
+
 Paquet porté pour la 2.7.0. Les tests n'ont été réalisé que sur un Eolebase.
 
 La version utilisé est mariadb 10.3

dicos/25_bdd_server.xml

@@ -2,25 +2,24 @@
     <files>
         <file filelist='dbMariaDB' name='/etc/mysql/conf.d/mariadb.cnf' rm='True' mkdir='True'/>
         <file filelist='dbCluster' name='/etc/mysql/conf.d/galera.cnf'  rm='True' mkdir='True'/>
-
         <file filelist='dbTunning' name='/etc/mysql/conf.d/tunning.cnf' rm='True' mkdir='True'/>
+
         <service servicelist='bdd'>mariadb</service>
         <service_access service='mariadb'>
-            <port service_accesslist='mariadb' protocol='tcp'>3306</port>
+            <port protocol='tcp'>3306</port>
-            <tcpwrapper service_accesslist='mariadb'>mariadb</tcpwrapper>
+            <tcpwrapper>mariadb</tcpwrapper>
         </service_access>
-        <service_access service='galera'>
-            <port service_accesslist='dbCluster' protocol='tcp'>4444</port>
-            <port service_accesslist='dbCluster' protocol='tcp'>4567</port>
-            <port service_accesslist='dbCluster' protocol='tcp'>4568</port>
-            <port service_accesslist='dbCluster' protocol='udp'>4567</port>
-            <tcpwrapper service_accesslist='mariadb'>mariadb</tcpwrapper>
-        </service_access>
-
         <service_restriction service='mariadb'>
            <ip interface='ifMariaDBLimit' interface_type="SymLinkOption" netmask='maskMariaDBLimit' netmask_type='SymLinkOption' ip_type='SymLinkOption'>ipMariaDBLimit</ip>
         </service_restriction>
 
+        <service_access service='galera'>
+            <port service_accesslist='dbCluster' protocol='tcp'>3306</port>
+            <port service_accesslist='dbCluster' protocol='tcp'>4444</port>
+            <port service_accesslist='dbCluster' protocol='tcp'>4567</port>
+            <port service_accesslist='dbCluster' protocol='tcp'>4568</port>
+            <port service_accesslist='dbCluster' protocol='udp'>4567</port>
+        </service_access>
         <service_restriction service='galera'>
            <ip interface='ifDBCluster' interface_type="SymLinkOption" netmask='255.255.255.255' ip_type='SymLinkOption'>dbClusterMember</ip>
         </service_restriction>
@@ -50,7 +49,13 @@
                 <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 -->
@@ -116,10 +121,9 @@
             <variable name='dbClusterName' type='string' description='Nom de la grappe'>
                <value>galera_cluster</value>
             </variable>
-            <variable name='ifDBCluster' type='string' description="Interface réseau dédiée à la grappe BDD"/>
+            <variable name='ifDBCluster' type='string' description="Interface réseau dédiée à la grappe BDD" mandatory='True'/>
-            <variable name='nodeName' type='domain' description="Nom de domaine du noeud"/>
+            <variable name='dbClusterMember' type='domain' description="Nom de domaine des membres de la grappe" multi="True" mandatory='True'/>
-
+            <variable name="dbClusterMemberIndex" description="Index du serveur dans la liste des membres de la grappe" type="number" mandatory="True"/>
-            <variable name='dbClusterMember' type='domain' description="Nom de domaine des membres de la grappe" multi="True"/>
             <!-- Expert Variables -->
             <variable name='dbBinLogFormat' type='string' mode='expert' description='Format du binlog'>
                <value>ROW</value>
@@ -137,10 +141,11 @@
         </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>	
 
@@ -169,9 +174,10 @@
            <slave>ifMariaDBLimit</slave>
         </group>
 
-        <fill name='calc_val' target='nodeName'>
+        <group master='db_name'>
-            <param type='eole'>nom_domaine_machine</param>
+            <slave>db_admin_user</slave>
-        </fill>
+        </group>
+
         <fill name='calc_multi_condition' target='accLimitTarget'>
             <param>Default</param>
             <param type='eole' name='condition_1'>accLimits</param>
@@ -184,13 +190,17 @@
             <target type='family'>MariaDB</target>
             <!--target type='family'>Grappe MariaDB</target-->
             <target type='family'>MariaDB Tunning</target>
-            <!--target type='service_accesslist'>dbCluster</target-->
             <target type='filelist'>dbTunning</target>
             <target type='filelist'>dbMariaDB</target>
             <!--target type='filelist'>dbCluster</target-->
             <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>

postservice/00-bdd-cluster

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [[ "$1" == "instance" ]] && [[ "$(CreoleGet dbEnable)" == "oui" ]] && [[ "$(CreoleGet dbEnableCluster)" == "oui" ]] && [[ "$(CreoleGet dbClusterPosition)" == "Leader" ]]
+then
+    service mariadb stop
+    galera_new_cluster
+fi
+
+exit 0

postservice/25-bdd-admin

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

posttemplate/25-bdd-cluster

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-db=$(CreoleGet dbEnable non)
-cluster=$(CreoleGet dbEnableCluster non)
-role=$(CreoleGet dbClusterPosition 'Node')
-gstateFile="/var/lib/mysql/grastate.dat"
-
-if [[ ${db} == "oui" ]]
-then
-    if [[ ${cluster} == "oui" ]]
-    then
-		if [[ ${role} == "Leader"  ]]
-		then
-			service mariadb stop
-		    galera_new_cluster
-		fi
-    fi
-fi
-
-exit 0

posttemplate/25-mariadb-passwd

@@ -1,66 +0,0 @@
-#!/bin/bash
-
-systemctl stop mariadb
-
-mariadb_cfdir=/etc/mysql/
-dc=$mysql_cfgdir/mariadbBackup.cnf
-mariadb_rundir=/var/run/mysqld/
-mariadb_statedir=/var/lib/mysql
-
-if [ -e "$dc" -a -n "`fgrep mysql_upgrade $dc 2>/dev/null`" ]; then
-    pass="`sed -n 's/^[ ]*password *= *// p' $dc | head -n 1`"
-    # Basedir is deprecated. Remove the option if it's in an existing mariadbBackup.cnf
-    sed -i '/basedir/d' "$dc"
-else
-    pass=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..16)'`;
-    if [ ! -d "$mariadb_cfdir" ]; then
-      then install -o 0 -g 0 -m 0755 -d $mariadb_cfdir
-    fi
-    umask 066
-    cat /dev/null > $dc
-    umask 022
-    echo "# Automatically generated DONT'T TOUCH !!!!!!"           >>$dc
-    echo "[client]"                                                >>$dc
-    echo "host     = localhost"                                    >>$dc
-    echo "user     = maria-sys-maint"                              >>$dc
-    echo "password = $pass"                                        >>$dc
-    echo "socket   = $mariadb_rundir/mysqld.sock"                  >>$dc
-    echo "[mysql_upgrade]"                                         >>$dc
-    echo "host     = localhost"                                    >>$dc
-    echo "user     = maria-sys-maint"	                           >>$dc
-    echo "password = $pass"                                        >>$dc
-    echo "socket   = $mariadb_rundir/mysqld.sock"                  >>$dc
-fi
-
-# If this dir chmod go+w then the admin did it. But this file should not.
-    chown 0:0 $dc
-    chmod 0600 $dc
-
-# If database doesn't exist we create it.
-mkdir /var/lib/mariadb-files
-mariadb_filesdir=/var/lib/mariadb-files
-
-if [ ! "$(ls -A "${mariadb_statedir}")" ] && [ -d "${mariadb_filesdir}" ]; then
-    existingdatabase=0
-    initfile=`mktemp --tmpdir=/var/lib/mariadb-files/`
-    touch "$initfile"
-    chmod 600 "$initfile"
-    chown mysql:mysql "$initfile"
-    echo "USE mysql; " >> "$initfile"
-    db_get mysql-server/root_password && rootpw="$RET"
-    if [ ! -z "$rootpw" ]; then
-      rootpw=$(printf %q "${rootpw}")
-      echo "ALTER USER 'root'@'localhost' IDENTIFIED BY '$rootpw';" >> "$initfile"
-    fi
-    echo "CREATE USER IF NOT EXISTS 'maria-sys-maint'@'localhost' IDENTIFIED BY '$pass';" >> "$initfile"
-    echo "GRANT ALL ON *.* TO 'maria-sys-maint'@'localhost' WITH GRANT OPTION;" >> "$initfile"
-    echo "SHUTDOWN;" >> "$initfile"
-    mysqld --initialize-insecure --user=mysql --init-file="$initfile"> /dev/null 2>&1 || true
-    rm "$initfile"
-else
-    existingdatabase=1
-fi
-
-systemctl start mariadb
-
-exit 0

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

tmpl/galera.cnf

@@ -8,7 +8,7 @@ wsrep_on=ON
 wsrep_provider=/usr/lib/galera/libgalera_smm.so
 # Galera Cluster Configuration
 wsrep_cluster_name="%%dbClusterName"
-wsrep_cluster_address="gcomm://%%nodeName,%%custom_join(%%dbClusterMember, ',')"
+wsrep_cluster_address="gcomm://%%custom_join(%%dbClusterMember, ',')"
 
 # Tunning
 wsrep_provider_options="gcache.size=%%dbClusterGcacheSizeMb"
@@ -18,4 +18,4 @@ wsrep_sst_method=%%dbSSTMethod
 
 # Galera Node Configuration
 wsrep_node_address="%%getVar('adresse_ip_' + %%ifDBCluster)"
-wsrep_node_name="%%nodeName"
+wsrep_node_name="%%dbClusterMember[%%dbClusterMemberIndex]