github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 13:24:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 4852e75bb1 into 873693b2ed

Browse source
This commit is contained in:
Maksim Usmanov | Maks 2025-04-27 14:25:48 +00:00 • committed by GitHub
commit 1a61c8da28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
func/db.sh
View file

@ -204,7 +204,16 @@ add_mysql_database() {
query="CREATE DATABASE \`$database\` CHARACTER SET $charset" query="CREATE DATABASE \`$database\` CHARACTER SET $charset"
mysql_query "$query" > /dev/null mysql_query "$query" > /dev/null
# This can be modified for mysql 5.7 for better compatibility
if [ "$(echo $mysql_ver |cut -d '.' -f1)" -eq 8 ]; then
query="CREATE USER IF NOT EXISTS '$dbuser'@'localhost' IDENTIFIED BY '$dbpass';"
mysql_query "$query" > /dev/null
query="CREATE USER IF NOT EXISTS '$dbuser'@'%' IDENTIFIED BY '$dbpass';"
mysql_query "$query" > /dev/null
query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@\`%\`"
query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@localhost"
mysql_query "$query" > /dev/null
else
query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@\`%\` query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@\`%\`
IDENTIFIED BY '$dbpass'" IDENTIFIED BY '$dbpass'"
mysql_query "$query" > /dev/null mysql_query "$query" > /dev/null
@ -212,8 +221,10 @@ add_mysql_database() {
query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@localhost query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@localhost
IDENTIFIED BY '$dbpass'" IDENTIFIED BY '$dbpass'"
mysql_query "$query" > /dev/null mysql_query "$query" > /dev/null
fi
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ]; then # for mysql 8 this will work only if mysql_native_password is enabled
# Not think yet how to add compatibility for new cached SHA-256 password system
if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ] || [ "$(echo $mysql_ver |cut -d '.' -f1)" -eq 8 ]; then
md5=$(mysql_query "SHOW CREATE USER \`$dbuser\`" 2>/dev/null) md5=$(mysql_query "SHOW CREATE USER \`$dbuser\`" 2>/dev/null)
md5=$(echo "$md5" |grep password |cut -f8 -d \') md5=$(echo "$md5" |grep password |cut -f8 -d \')
else else