diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2020-03-11 18:12:45 +0100 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2020-03-11 18:12:45 +0100 |
| commit | 3b0436d828b38b05ccc1ff89878fdcfa975f91a5 (patch) | |
| tree | f4333c2353c8d82715ea63e347ee7a688be57067 | |
| parent | 7d8d8afe243b0c409530da03db2e48c950556cd2 (diff) | |
#964: Update script copies the MySQL / MariaDB template configuration file.
| -rwxr-xr-x | installer/opengnsys_update.sh | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index e41db7d9..d8df7bca 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -95,7 +95,7 @@ LOG_FILE=/tmp/$(basename $OGLOGFILE) # - OSDISTRIB - distribución Linux # - DEPENDENCIES - array de dependencias que deben estar instaladas # - UPDATEPKGLIST, INSTALLPKGS, CHECKPKG - comandos para gestión de paquetes -# - APACHECFGDIR, APACHESERV, PHPFPMSERV, DHCPSERV, INETDCFGDIR - configuración y servicios +# - APACHECFGDIR, APACHESERV, PHPFPMSERV, DHCPSERV, MYSQLSERV, MYSQLCFGDIR, INETDCFGDIR - configuración y servicios function autoConfigure() { @@ -138,6 +138,8 @@ function autoConfigure() APACHEDISABLEMODS="php" APACHEUSER="www-data" APACHEGROUP="www-data" + MYSQLCFGDIR=/etc/mysql/mysql.conf.d + MYSQLSERV="mysql" PHPFPMSERV="php-fpm" INETDCFGDIR=/etc/xinetd.d elif [ -f /etc/redhat-release ]; then @@ -161,6 +163,8 @@ function autoConfigure() fi APACHEUSER="apache" APACHEGROUP="apache" + MYSQLCFGDIR=/etc/my.cnf.d + MYSQLSERV="mariadb" PHPFPMSERV="php-fpm" INETDCFGDIR=/etc/xinetd.d else @@ -396,27 +400,10 @@ SELECT CASE WHEN DATA_TYPE LIKE '%int' THEN # Comprobar configuración de MySQL y recomendar cambios necesarios. function checkMysqlConfig() { - if [ $# -ne 2 ]; then - errorAndLog "${FNCNAME}(): invalid number of parameters" - exit 1 - fi - - local dbuser="$1" - local dbpassword="$2" - local mycnf=/tmp/.my.cnf.$$ - echoAndLog "${FUNCNAME}(): checking MySQL configuration" - touch $mycnf - cat << EOT > $mycnf -[client] -user=$dbuser -password=$dbpassword -EOT - # Check if scheduler is active. - if [ "$(mysql --defaults-extra-file=$mycnf -Nse 'SELECT @@GLOBAL.event_scheduler;')" = "OFF" ]; then - MYSQLCONFIG="SET GLOBAL event_scheduler = ON; " - fi - rm -f $mycnf + + cp -a $WORKDIR/opengnsys/server/etc/mysqld-og.cnf $MYSQLCFGDIR 2>/dev/null + service=$MYSQLSERV; $STARTSERVICE echoAndLog "${FUNCNAME}(): MySQL configuration has checked" return 0 @@ -1228,10 +1215,6 @@ function updateSummary() if [ -n "$INSTALLEDOGLIVE" ]; then echoAndLog " - Installed new ogLive Client: $INSTALLEDOGLIVE" fi - if [ -n "$MYSQLCONFIG" ]; then - echoAndLog " - MySQL must be reconfigured, run next code as DB root user and restart service:" - echoAndLog " $MYSQLCONFIG" - fi echoAndLog " - If you want to use BURG as boot manager, run following command as root:" echoAndLog " curl $DOWNLOADURL/burg.tgz -o $INSTALL_TARGET/client/lib/burg.tgz" |