Skip to content

Commit eb7e6d2

Browse files
authored
Fixing MySQL restore user privileges (MariaDB)
Fix hestiacp#1523
1 parent 6b97f73 commit eb7e6d2

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

func/rebuild.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -535,11 +535,15 @@ rebuild_mail_domain_conf() {
535535
rebuild_mysql_database() {
536536
mysql_connect $HOST
537537
mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null
538-
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ]; then
539-
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" >/dev/null
540-
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" >/dev/null
541-
query="UPDATE mysql.user SET authentication_string='$MD5'"
542-
query="$query WHERE User='$DBUSER'"
538+
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ] || [ "$mysql_fork" = "mariadb" ]; then
539+
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`"
540+
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost"
541+
if [ "$mysql_fork" = "mariadb" ]; then
542+
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
543+
else
544+
query="UPDATE mysql.user SET authentication_string='$MD5'"
545+
query="$query WHERE User='$DBUSER'"
546+
fi
543547
else
544548
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
545549
fi

0 commit comments

Comments
 (0)