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

This commit is contained in:
Philippe Caseiro 2018-04-12 16:34:03 +02:00
commit c723edd095
1 changed files with 5 additions and 4 deletions

View File

@ -7,13 +7,14 @@
ROLE=$(CreoleGet dbClusterPosition) ROLE=$(CreoleGet dbClusterPosition)
SECURE_CMD="mysql_secure_installation" SECURE_CMD="mysql_secure_installation"
PASSWORD=$(pwgen -1 10) PASSWORD=$(pwgen -1 10)
passwd="/usr/share/eole/scripts/mariadbPwd" passwd="/usr/share/eole/sbin/mariadbPwd"
logfile="/var/log/eole/maria-init.log"
${passwd} ${PASSWORD} ${passwd} ${PASSWORD}
# Run secure installation script # Run secure installation script
${SECURE_CMD} <<__EOF__ ${SECURE_CMD} > ${logfile} 2>&1 <<__EOF__
${oldPass} ${PASSWORD}
y y
n n
y y