@@ -1068,11 +1068,21 @@ if [ "$mysql" = 'yes' ]; then
10681068 mysqladmin -u root password $mpass
10691069 echo -e " [client]\npassword='$mpass '\n" > /root/.my.cnf
10701070 chmod 600 /root/.my.cnf
1071- mysql -e " DELETE FROM mysql.user WHERE User=''"
1072- mysql -e " DROP DATABASE test" > /dev/null 2>&1
1073- mysql -e " DELETE FROM mysql.db WHERE Db='test' OR Db='test\\ _%'"
1074- mysql -e " DELETE FROM mysql.user WHERE user='' OR password='';"
1075- mysql -e " FLUSH PRIVILEGES"
1071+ if [ " $release " = ' 16.04' ]; then
1072+ mysql -e " DELETE FROM mysql.user WHERE User=''"
1073+ mysql -e " DROP DATABASE test" > /dev/null 2>&1
1074+ mysql -e " DELETE FROM mysql.db WHERE Db='test' OR Db='test\\ _%'"
1075+ mysql -e " DELETE FROM mysql.user WHERE user='' OR password='';"
1076+ mysql -e " FLUSH PRIVILEGES"
1077+ fi
1078+ if [ " $release " = ' 18.04' ]; then
1079+ mysql -e " DELETE FROM mysql.user WHERE User=''"
1080+ mysql -e " DROP DATABASE test" > /dev/null 2>&1
1081+ mysql -e " DELETE FROM mysql.db WHERE Db='test' OR Db='test\\ _%'"
1082+ mysql -e " DELETE FROM mysql.user WHERE user='';"
1083+ mysql -e " ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$mpass ';"
1084+ mysql -e " FLUSH PRIVILEGES"
1085+ fi
10761086
10771087 # Configuring phpMyAdmin
10781088 if [ " $apache " = ' yes' ]; then
12991309# Special thanks to Pavel Galkin (https://skurudo.ru)
13001310# https://github.com/skurudo/phpmyadmin-fixer
13011311
1302- source $hestiacp /phpmyadmin/pma.sh
1312+ source $hestiacp /phpmyadmin/pma.sh > /dev/null 2>&1
13031313
13041314
13051315# ----------------------------------------------------------#
0 commit comments