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

This commit is contained in:
Philippe Caseiro 2018-05-09 15:41:23 +02:00
commit 517625cf66
1 changed files with 5 additions and 2 deletions

View File

@ -4,7 +4,10 @@
# 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"
@ -17,7 +20,6 @@ logfile="${logdir}/maria-init.log"
if [[ ${ROLE} == "Leader" ]]
then
service mariadb start
${passwd} ${PASSWORD}
# Run secure installation script
@ -30,7 +32,8 @@ y
y
y
__EOF__
service mariadb stop
touch ${INITDONE}
exit ${?}
else
exit 0
fi