Skip to content

Commit d1a5f85

Browse files
jaapmarcusjaapmarcus
authored
Fix: Update installers due mysql got overwritten by accident (hestiacp#3544)
* Update installers due mysql got overwritten by accident * Update v-add-database-host * Fix error * Update changelog * Update changelog
1 parent 7c2ebce commit d1a5f85

File tree

5 files changed

+50
-29
lines changed

5 files changed

+50
-29
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.7.5] - Service release
6+
7+
### Bugfixes
8+
9+
- Fix issue with install MariaDB (#3543)
10+
- Add a check to prevent ARM64 installs with Mysql8 on Debian (#3543)
11+
512
## [1.7.4] - Service release
613

714
### Features

‎bin/v-add-database-host‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,25 @@ is_mysql_host_alive() {
4444
echo "port='$port'" >> $mycnf
4545

4646
chmod 600 $mycnf
47-
mysql --defaults-file=$mycnf -e 'SELECT VERSION()' > /dev/null 2>&1
47+
mysql_out=$(mktemp)
48+
if [ -f '/usr/bin/mariadb' ]; then
49+
mariadb --defaults-file=$mycnf -e 'SELECT VERSION()' > $mysql_out 2>&1
50+
else
51+
mysql --defaults-file=$mycnf -e 'SELECT VERSION()' > $mysql_out 2>&1
52+
fi
4853
if [ "$?" -ne '0' ]; then
4954
echo "Error: MySQL connection to $host failed"
5055
rm $mycnf
5156
log_event "$E_CONNECT" "$ARGUMENTS"
5257
exit "$E_CONNECT"
5358
fi
5459

55-
grants=$(mysql --defaults-file=$mycnf -e 'SHOW GRANTS FOR CURRENT_USER();')
60+
if [ -f '/usr/bin/mariadb' ]; then
61+
grants=$(mariadb --defaults-file=$mycnf -e 'SHOW GRANTS FOR CURRENT_USER();')
62+
else
63+
grants=$(mysql --defaults-file=$mycnf -e 'SHOW GRANTS FOR CURRENT_USER();')
64+
fi
65+
5666
if [ "$?" -ne '0' ]; then
5767
echo "Error: MySQL connection to $host failed"
5868
rm $mycnf

‎install/deb/phpmyadmin/pma.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,23 @@ PMAUSER=pma
5656

5757
#CREATE PMA USER
5858
if [ -f '/usr/bin/mariadb' ]; then
59-
mysql="mariadb"
59+
mysql_server="mariadb"
6060
else
61-
mysql="mysql"
61+
mysql_server="mysql"
6262
fi
6363

64-
$mysql -uroot << MYSQL_PMA2
64+
$mysql_server -uroot << MYSQL_PMA2
6565
CREATE USER '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';
6666
CREATE DATABASE $PMADB;
6767
MYSQL_PMA2
6868

6969
#GRANT PMA USE SOME RIGHTS
70-
$mysql -uroot << MYSQL_PMA3
70+
$mysql_server -uroot << MYSQL_PMA3
7171
USE $PMADB;
7272
GRANT USAGE ON $PMADB.* TO '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';
7373
GRANT ALL PRIVILEGES ON $PMADB.* TO '$PMAUSER'@'localhost';
7474
FLUSH PRIVILEGES;
7575
MYSQL_PMA3
7676

7777
#MYSQL DB and TABLES ADDITION
78-
$mysql -uroot < "$HESTIA_INSTALL_DIR/phpmyadmin/create_tables.sql"
78+
$mysql_server -uroot < "$HESTIA_INSTALL_DIR/phpmyadmin/create_tables.sql"

‎install/hst-install-debian.sh‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,10 @@ if [ "$mysql" = 'yes' ] && [ "$mysqlclassic" = 'yes' ]; then
320320
mysql='no'
321321
fi
322322

323+
if [ "$mysqlclassic" = 'yes' ] && [ "$architecture" = 'aarch64' ]; then
324+
check_result 1 "Mysql 8 does not support ARM64 yet for Debian please use Ubuntu. Unable to continue"
325+
fi
326+
323327
# Checking root permissions
324328
if [ "x$(id -u)" != 'x0' ]; then
325329
check_result 1 "Script can be run executed only by root"
@@ -1555,27 +1559,27 @@ if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
15551559
chmod 600 /root/.my.cnf
15561560

15571561
if [ -f '/usr/bin/mariadb' ]; then
1558-
mysql="mariadb"
1562+
mysql_server="mariadb"
15591563
else
1560-
mysql="mysql"
1564+
mysql_server="mysql"
15611565
fi
15621566
# Alter root password
1563-
$mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$mpass'; FLUSH PRIVILEGES;"
1567+
$mysql_server -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$mpass'; FLUSH PRIVILEGES;"
15641568
if [ "$mysql_type" = 'MariaDB' ]; then
15651569
# Allow mysql access via socket for startup
1566-
$mysql -e "UPDATE mysql.global_priv SET priv=json_set(priv, '$.password_last_changed', UNIX_TIMESTAMP(), '$.plugin', 'mysql_native_password', '$.authentication_string', 'invalid', '$.auth_or', json_array(json_object(), json_object('plugin', 'unix_socket'))) WHERE User='root';"
1570+
$mysql_server -e "UPDATE mysql.global_priv SET priv=json_set(priv, '$.password_last_changed', UNIX_TIMESTAMP(), '$.plugin', 'mysql_native_password', '$.authentication_string', 'invalid', '$.auth_or', json_array(json_object(), json_object('plugin', 'unix_socket'))) WHERE User='root';"
15671571
# Disable anonymous users
1568-
$mysql -e "DELETE FROM mysql.global_priv WHERE User='';"
1572+
$mysql_server -e "DELETE FROM mysql.global_priv WHERE User='';"
15691573
else
1570-
$mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '$mpass';"
1571-
$mysql -e "DELETE FROM mysql.user WHERE User='';"
1572-
$mysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
1574+
$mysql_server -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '$mpass';"
1575+
$mysql_server -e "DELETE FROM mysql.user WHERE User='';"
1576+
$mysql_server -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
15731577
fi
15741578
# Drop test database
1575-
$mysql -e "DROP DATABASE IF EXISTS test"
1576-
$mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
1579+
$mysql_server -e "DROP DATABASE IF EXISTS test"
1580+
$mysql_server -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
15771581
# Flush privileges
1578-
$mysql -e "FLUSH PRIVILEGES;"
1582+
$mysql_server -e "FLUSH PRIVILEGES;"
15791583
fi
15801584

15811585
#----------------------------------------------------------#

‎install/hst-install-ubuntu.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,27 +1598,27 @@ if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
15981598
chmod 600 /root/.my.cnf
15991599

16001600
if [ -f '/usr/bin/mariadb' ]; then
1601-
mysql="mariadb"
1601+
mysql_server="mariadb"
16021602
else
1603-
mysql="mysql"
1603+
mysql_server="mysql"
16041604
fi
16051605
# Alter root password
1606-
$mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$mpass'; FLUSH PRIVILEGES;"
1606+
$mysql_server -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$mpass'; FLUSH PRIVILEGES;"
16071607
if [ "$mysql_type" = 'MariaDB' ]; then
16081608
# Allow mysql access via socket for startup
1609-
$mysql -e "UPDATE mysql.global_priv SET priv=json_set(priv, '$.password_last_changed', UNIX_TIMESTAMP(), '$.plugin', 'mysql_native_password', '$.authentication_string', 'invalid', '$.auth_or', json_array(json_object(), json_object('plugin', 'unix_socket'))) WHERE User='root';"
1609+
$mysql_server -e "UPDATE mysql.global_priv SET priv=json_set(priv, '$.password_last_changed', UNIX_TIMESTAMP(), '$.plugin', 'mysql_native_password', '$.authentication_string', 'invalid', '$.auth_or', json_array(json_object(), json_object('plugin', 'unix_socket'))) WHERE User='root';"
16101610
# Disable anonymous users
1611-
$mysql -e "DELETE FROM mysql.global_priv WHERE User='';"
1611+
$mysql_server -e "DELETE FROM mysql.global_priv WHERE User='';"
16121612
else
1613-
$mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '$mpass';"
1614-
$mysql -e "DELETE FROM mysql.user WHERE User='';"
1615-
$mysql -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
1613+
$mysql_server -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY '$mpass';"
1614+
$mysql_server -e "DELETE FROM mysql.user WHERE User='';"
1615+
$mysql_server -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
16161616
fi
16171617
# Drop test database
1618-
$mysql -e "DROP DATABASE IF EXISTS test"
1619-
$mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
1618+
$mysql_server -e "DROP DATABASE IF EXISTS test"
1619+
$mysql_server -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'"
16201620
# Flush privileges
1621-
$mysql -e "FLUSH PRIVILEGES;"
1621+
$mysql_server -e "FLUSH PRIVILEGES;"
16221622
fi
16231623

16241624
#----------------------------------------------------------#

0 commit comments

Comments
 (0)