Skip to content

Commit 28e391f

Browse files
committed
fix: Make sure MariaDB configures correct lc-messages-dir
1 parent 0f20516 commit 28e391f

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

install/hst-install-debian.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,6 +1776,7 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
17761776
fi
17771777

17781778
if [ "$mysql_type" = 'MariaDB' ]; then
1779+
sed -i 's|/usr/share/mysql|/usr/share/mariadb|g' /etc/mysql/my.cnf
17791780
update-rc.d mariadb defaults > /dev/null 2>&1
17801781
systemctl -q enable mariadb 2> /dev/null
17811782
systemctl start mariadb >> $LOG

install/hst-install-ubuntu.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,6 +1810,7 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
18101810
fi
18111811

18121812
if [ "$mysql_type" = 'MariaDB' ]; then
1813+
sed -i 's|/usr/share/mysql|/usr/share/mariadb|g' /etc/mysql/my.cnf
18131814
update-rc.d mariadb defaults > /dev/null 2>&1
18141815
systemctl -q enable mariadb 2> /dev/null
18151816
systemctl start mariadb >> $LOG

install/upgrade/versions/1.9.0.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ if [ -s /etc/nginx/conf.d/phpmyadmin.inc ]; then
9797
cp -f $HESTIA_INSTALL_DIR/nginx/phpmyadmin.inc /etc/nginx/conf.d/phpmyadmin.inc
9898
fi
9999

100+
# Fix MySQL lc-messages-dir path for mariadb
101+
if [ -x /usr/bin/mariadb ]; then
102+
sed -i 's|/usr/share/mysql|/usr/share/mariadb|g' /etc/mysql/my.cnf
103+
fi
104+
100105
$BIN/v-add-user-notification 'admin' 'Hestia security has been upgraded' ' A new user "hestiaweb" has been created and is used for login. Make sure other Hestia packages are updated as well otherwise the system may not work as expected.'
101106
add_upgrade_message 'Security has been upgraded, A new user "hestiaweb" has been created and is used for login. Make sure other Hestia packages are updated as well otherwise the system may not work as expected.'
102107
# Ensures proper permissions for Hestia service interactions.

0 commit comments

Comments
 (0)