Changed config folder due to MariaDB 10.5

Author: jaapmarcus

func/upgrade.sh

@@ -435,7 +435,8 @@ upgrade_start_backup() {
                 echo "      ---- mysql"
             fi
             cp -f /etc/mysql/*.cnf $HESTIA_BACKUP/conf/mysql/
-            cp -f /etc/mysql/conf.d/*.cnf $HESTIA_BACKUP/conf/mysql/      
+            cp -f /etc/mysql/conf.d/*.cnf $HESTIA_BACKUP/conf/mysql/ > /dev/null 2>&1
+            cp -f /etc/mysql/mariadb.conf.d/*.cnf $HESTIA_BACKUP/conf/mysql/ > /dev/null 2>&1       
         fi
         if [[ "$DB_SYSTEM" =~ "pgsql" ]]; then
             if [ "$DEBUG_MODE" = "true" ]; then

install/deb/mysql/my-large.cnf

@@ -40,3 +40,4 @@ interactive_timeout=50
 long_query_time=5
 
 !includedir /etc/mysql/conf.d/
+!includedir /etc/mysql/mariadb.conf.d/

install/deb/mysql/my-medium.cnf

@@ -39,3 +39,4 @@ interactive_timeout=50
 long_query_time=5
 
 !includedir /etc/mysql/conf.d/
+!includedir /etc/mysql/mariadb.conf.d/

install/deb/mysql/my-small.cnf

@@ -39,3 +39,4 @@ interactive_timeout=50
 long_query_time=5
 
 !includedir /etc/mysql/conf.d/
+!includedir /etc/mysql/mariadb.conf.d/

install/upgrade/manual/upgrade_mariadb.sh

@@ -53,6 +53,6 @@ apt remove -qq mariadb-server -y  > /dev/null 2>&1
 
 # Install new version and run upgrader
 echo "Installing new MariaDB Server, start and run upgrade..."
-apt install -qq mariadb-server -y  > /dev/null 2>&1
+apt install -qq mariadb-server -y 
 systemctl start mysql > /dev/null 2>&1
 mysql_upgrade