Merge branch 'master' into dist/eole/2.6.2/master

dicos/25_bdd_server.xml

@@ -1,6 +1,8 @@
 <creole>
 	<files>
-		<file filelist='dbCluster' name='/etc/mysql/conf.d/galera.cnf' rm='True' mkdir='True'/>
+		<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'>
@@ -160,9 +162,13 @@
 
 		<condition name='disabled_if_in' source="dbEnable">
 			<param>non</param>
-			<target type='family'>Database Cluster</target>
 			<target type='family'>Database</target>
+			<target type='family'>Database Cluster</target>
+			<target type='family'>DataBase 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>
 
@@ -192,6 +198,14 @@
 			<target type='variable'>dbSlowQueryLogTime</target>
 			<target type='variable'>dbSlowQueryLogFile</target>
 		</condition>
+
+		<condition name='disabled_if_in' source="dbClusterPosition">
+			<param>Node</param>
+			<target type='variable'>dbCreateFixAdmin</target>
+			<target type='variable'>accName</target>
+			<target type='variable'>accLimits</target>
+			<target type='variable'>accLimitTarget</target>
+		</condition>
 	</constraints>
 	<help/>
 </creole>

postservice/25-bdd-admin

@@ -2,6 +2,12 @@
 
 todo=$(CreoleGet dbCreateFixAdmin 'non')
 autoRepair=$(CreoleGet dbAutoOptimizeAndRepare 'non')
+role=$(CreoleGet dbClusterPosition 'Leader')
+
+if [[ ${role} == 'Node' ]]
+then
+   exit 0
+fi
 
 if [[ ${todo} != 'non' ]]
 then
@@ -13,6 +19,9 @@ then
     tempFile=$(mktemp -p /root)
     sqlFile=$(mktemp -p /root)
 
+    password=$(pwgen -1 10)
+    /usr/share/eole/sbin/mariadbPwd ${password}
+
     accounts=($(CreoleGet accName))
     limits="$(CreoleGet accLimitTarget '')"
     accLimits=(${limits// /})
@@ -31,8 +40,8 @@ then
         then
             hostsList+=(${accLimits[${index}]//,/ })
         else
-            ipAddr=($(CreoleGet ip_my_dist))
-            ipMask=($(CreoleGet mask_my_dist))
+            ipAddr=($(CreoleGet ipMariaDBLimit))
+            ipMask=($(CreoleGet maskMariaDBLimit))
             if [[ ${ipMask} == "255.255.255.255" ]]
             then
                 hostsList+=("${ipAddr}")
@@ -55,7 +64,7 @@ then
         index=$((index+1))
     done
 
-	mysql < ${sqlFile}
+	mysql -u root --password=${password} < ${sqlFile}
 
     mv ${tempFile} ${readerfile}
     chmod 600 ${readerfile}
@@ -64,7 +73,10 @@ fi
 
 if [[ ${autoRepair} == "oui" ]]
 then
-	mysqlcheck -u root --auto-repair --check --optimize --all-databases
+
+	mysqlcheck -u root -p ${password} --auto-repair --check --all-databases
+	mysqlcheck -u root -p ${password} --optimize --check --all-databases
+
 fi
 
 exit 0

posttemplate/25-bdd-cluster

@@ -9,7 +9,11 @@ if [[ ${db} == "oui" ]]
 then
     if [[ ${cluster} == "oui" ]]
     then
-		[[ ${role} == "Leader"  ]] && galera_new_cluster
+		if [[ ${role} == "Leader"  ]]
+		then
+			service mariadb stop
+		    galera_new_cluster
+		fi
     fi
 fi
 

preservice/25-bdd-init

@@ -4,14 +4,23 @@
 # and secure MariaDB installation
 #
 
+INITDONE="/etc/eole/.galera"
+
+[[ "$(CreoleGet dbEnable)" == "non" ]] && exit 0
+[[ -e ${INITDONE} ]] && exit 0
+
 ROLE=$(CreoleGet dbClusterPosition 'Leader')
 SECURE_CMD="mysql_secure_installation"
 PASSWORD=$(pwgen -1 10)
 passwd="/usr/share/eole/sbin/mariadbPwd"
-logfile="/var/log/eole/maria-init.log"
+logdir="/var/log/eole"
+logfile="${logdir}/maria-init.log"
+
+[[ ! -d "${logdir}"  ]] && mkdir -p ${logdir}
 
 if [[ ${ROLE} == "Leader" ]]
 then
+   service mysql start
    ${passwd} ${PASSWORD}
 
    # Run secure installation script
@@ -24,6 +33,15 @@ y
 y
 y
 __EOF__
+   if [[ ${?} -eq 0 ]]
+   then
+	   service mysql stop
+	   touch ${INITDONE}
+	   exit ${?}
+   else
+	   service mysql stop
+	   exit ${?}
+   fi
 else
    exit 0
 fi

tmpl/mariadb.cnf

@@ -0,0 +1,21 @@
+# MariaDB-specific config file.
+# Read by /etc/mysql/my.cnf
+
+[client]
+# Default is Latin1, if you need UTF-8 set this (also in server section)
+#default-character-set = utf8
+
+[mysqld]
+#
+# * Character sets
+#
+# Default is Latin1, if you need UTF-8 set all this (also in client section)
+#
+#character-set-server  = utf8
+#collation-server      = utf8_general_ci
+#character_set_server   = utf8
+#collation_server       = utf8_general_ci
+# Import all .cnf files from configuration directory
+plugin-load-add = auth_socket.so
+!includedir /etc/mysql/mariadb.conf.d/
+