Merge branch 'master' into trunk

This commit is contained in:
Alexey Pustovalov
2019-07-13 18:03:05 +03:00
40 changed files with 127 additions and 21 deletions

View File

@ -54,6 +54,9 @@ configure_db_mysql() {
elif [ -f "/etc/my.cnf.d/server.cnf" ]; then
MYSQL_CONF_FILE="/etc/my.cnf.d/server.cnf"
DB_SERVER_SOCKET="/var/lib/mysql/mysql.sock"
elif [ -f "/etc/my.cnf.d/mariadb-server.cnf" ]; then
MYSQL_CONF_FILE="/etc/my.cnf.d/mariadb-server.cnf"
DB_SERVER_SOCKET="/var/run/mysqld/mysqld.sock"
else
echo "**** Could not found MySQL configuration file"
exit 1