github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring rebuild_mysql_database() func

Browse source 
Fix #1523
This commit is contained in:
dpeca 2018-04-06 14:50:42 +02:00 • committed by GitHub
commit 7ec123a861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
func/rebuild.sh
View file

@ -535,21 +535,30 @@ rebuild_mail_domain_conf() {
rebuild_mysql_database() { rebuild_mysql_database() {
mysql_connect $HOST mysql_connect $HOST
mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ] || [ "$mysql_fork" = "mariadb" ]; then if [ "$mysql_fork" = "mysql" ]; then
if [ "$mysql_fork" = "mariadb" ] && [ "$(echo $mysql_ver |cut -d '.' -f1)" -eq 5 ]; then # mysql
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ]; then
# mysql >= 5.7
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null
query="UPDATE mysql.user SET authentication_string='$MD5'"
query="$query WHERE User='$DBUSER'"
else
# mysql < 5.7
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
fi
else
# mariadb
if [ "$(echo $mysql_ver |cut -d '.' -f1)" -eq 5 ]; then
# mariadb = 5
mysql_query "CREATE USER \`$DBUSER\`" > /dev/null mysql_query "CREATE USER \`$DBUSER\`" > /dev/null
mysql_query "CREATE USER \`$DBUSER\`@localhost" > /dev/null mysql_query "CREATE USER \`$DBUSER\`@localhost" > /dev/null
else else
# mariadb = 10
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null
mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null
fi fi
if [ "$mysql_fork" = "mariadb" ]; then # mariadb any version
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
else
query="UPDATE mysql.user SET authentication_string='$MD5'"
query="$query WHERE User='$DBUSER'"
fi
else
query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'" query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'"
fi fi
mysql_query "GRANT ALL ON \`$DB\`.* TO \`$DBUSER\`@\`%\`" >/dev/null mysql_query "GRANT ALL ON \`$DB\`.* TO \`$DBUSER\`@\`%\`" >/dev/null