From 3cbfed8f2dd9fbf770fbabe908c94489dfb8f184 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Thu, 12 Apr 2018 17:10:39 +0200 Subject: [PATCH] Correct management of leadership --- preservice/25-bdd-init | 13 +++++++++---- scripts/mariadbPwd | 28 ++++++++++++++++++---------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/preservice/25-bdd-init b/preservice/25-bdd-init index 80d88b8..2646bd6 100644 --- a/preservice/25-bdd-init +++ b/preservice/25-bdd-init @@ -4,16 +4,18 @@ # and secure MariaDB installation # -ROLE=$(CreoleGet dbClusterPosition) +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" -${passwd} ${PASSWORD} +if [[ ${ROLE} == "Leader" ]] +then + ${passwd} ${PASSWORD} -# Run secure installation script -${SECURE_CMD} > ${logfile} 2>&1 <<__EOF__ + # Run secure installation script + ${SECURE_CMD} > ${logfile} 2>&1 <<__EOF__ ${PASSWORD} y n @@ -22,3 +24,6 @@ y y y __EOF__ +else + exit 0 +fi \ No newline at end of file diff --git a/scripts/mariadbPwd b/scripts/mariadbPwd index 59994d5..61983a9 100644 --- a/scripts/mariadbPwd +++ b/scripts/mariadbPwd @@ -6,15 +6,23 @@ cmd="mysql" options='--defaults-file=/etc/mysql/debian.cnf' -if [[ -z ${1} ]] +role=$(CreoleGet dbClusterRole 'Leader') + +if [[ ${role} == "Leader"]] then - read -s -p "New Password : " password - echo + if [[ -z ${1} ]] + then + read -s -p "New Password : " password + echo + else + password="${1}" + fi + + sql="FLUSH PRIVILEGES; ALTER USER 'root'@'localhost' IDENTIFIED BY '${password}';" + + ${cmd} ${options} -e "${sql}" + exit $? else - password="${1}" -fi - -sql="FLUSH PRIVILEGES; ALTER USER 'root'@'localhost' IDENTIFIED BY '${password}';" - -${cmd} ${options} -e "${sql}" -exit $? \ No newline at end of file + echo "This command don't work in a MariaDB Cluster Node, try in the Leader" + exit 3 +fi \ No newline at end of file