Просмотр исходного кода

Merge pull request #4725 from rjd22/fix-languages-mariadb

fix: Make sure MariaDB configures correct lc-messages-dir
Robert-Jan de Dreu 1 год назад
Родитель
Сommit
89b3fb0b31

+ 1 - 0
install/hst-install-debian.sh

@@ -1776,6 +1776,7 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
 	fi
 
 	if [ "$mysql_type" = 'MariaDB' ]; then
+		sed -i 's|/usr/share/mysql|/usr/share/mariadb|g' /etc/mysql/my.cnf
 		update-rc.d mariadb defaults > /dev/null 2>&1
 		systemctl -q enable mariadb 2> /dev/null
 		systemctl start mariadb >> $LOG

+ 1 - 0
install/hst-install-ubuntu.sh

@@ -1810,6 +1810,7 @@ if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
 	fi
 
 	if [ "$mysql_type" = 'MariaDB' ]; then
+		sed -i 's|/usr/share/mysql|/usr/share/mariadb|g' /etc/mysql/my.cnf
 		update-rc.d mariadb defaults > /dev/null 2>&1
 		systemctl -q enable mariadb 2> /dev/null
 		systemctl start mariadb >> $LOG

+ 5 - 0
install/upgrade/versions/1.9.0.sh

@@ -97,6 +97,11 @@ if [ -s /etc/nginx/conf.d/phpmyadmin.inc ]; then
 	cp -f $HESTIA_INSTALL_DIR/nginx/phpmyadmin.inc /etc/nginx/conf.d/phpmyadmin.inc
 fi
 
+# Fix MySQL lc-messages-dir path for mariadb
+if [ -x /usr/bin/mariadb ]; then
+	sed -i 's|/usr/share/mysql|/usr/share/mariadb|g' /etc/mysql/my.cnf
+fi
+
 $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.'
 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.'
 # Ensures proper permissions for Hestia service interactions.