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

This commit is contained in:
Philippe Caseiro 2018-05-09 14:26:02 +02:00
commit 7a9855f234
2 changed files with 4 additions and 1 deletions

View File

@ -162,8 +162,9 @@
<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>

View File

@ -4,6 +4,8 @@
# and secure MariaDB installation
#
[[ "$(CreoleGet dbEnable)" == "non" ]] && exit 0
ROLE=$(CreoleGet dbClusterPosition 'Leader')
SECURE_CMD="mysql_secure_installation"
PASSWORD=$(pwgen -1 10)