diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/000readme smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/000readme --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/000readme 2017-02-19 09:44:53.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/000readme 1969-12-31 19:00:00.000000000 -0500 @@ -1,33 +0,0 @@ -########################################################### -# Here is a cheat-sheet for this file as of MySQL 4.0.14 -# 2003-12-18 - tony_clayton@mitel.com -# -# 1. The mysqld binary reads options from the [mysqld] section, -# and then overrides those values with any passed-in -# arguments. -# -# 2. The mysqld_safe script reads options from the following -# sections in order, overriding any previous values with newer -# ones: -# [mysqld] [server] [mysqld_safe] [safe_mysqld] -# It then overrides those values with any passed-in -# arguments, and invokes the mysqld binary (see #1 above) with -# the resulting argument list. -# -# * The server and safe_mysqld sections are deprecated in -# favour of mysqld and mysqld_safe respectively. -# -# 3. The mysql or mysqld initscript reads options from the -# following sections in order, overriding any previous values -# with newer ones: -# [mysqld] [mysql_server] [mysql.server] -# It then overrides those values with any passed-in arguments, -# and invokes the mysqld_safe script (see #2 above) with the -# resulting argument list. -# -# * The SMEServer doesn't have any need for initscript-only -# options, so we don't use mysql_server and mysql.server -# sections. -# -########################################################### - diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/005mysqld smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/005mysqld --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/005mysqld 2017-02-19 09:44:53.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/005mysqld 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -[mysqld] diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006logfile smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006logfile --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006logfile 2017-02-19 09:44:53.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006logfile 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -log-error=/var/log/mysql57-mysqld.log diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file 2017-03-12 21:11:47.132000000 -0400 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/006pid-file 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -pid-file=/opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir 2017-03-12 21:11:47.132000000 -0400 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/007basedir 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -basedir=/opt/rh/rh-mysql57/root/usr diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir 2017-03-12 21:11:47.132000000 -0400 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/008datadir 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -datadir=/opt/rh/rh-mysql57/root/var/lib/mysql diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/009socket smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/009socket --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/009socket 2017-02-19 09:49:56.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/009socket 1969-12-31 19:00:00.000000000 -0500 @@ -1,12 +0,0 @@ -socket=/var/lib/mysql/mysql57.sock -{ - use esmith::ConfigDB; - my $db = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n"; - my $mysql57mysqld = $db->get('mysql57-mysqld') or die "not found"; - - my $localonly = $mysql57mysqld->prop(LocalNetworkingOnly) || "no"; - $OUT = ($localonly eq 'yes') ? "skip-networking\n" : "# networking is enabled\n"; - # define port - my $port = $mysql57mysqld->prop('port') || "3309"; - $OUT .= ($localonly eq 'yes') ? "#no port as skip-networking\n" : "port=$port\n"; -} diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/010mysqld-log-error smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/010mysqld-log-error --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/010mysqld-log-error 2017-02-19 09:44:53.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/010mysqld-log-error 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -log-error=/var/log/mysql57-mysqld.log diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011max_allowed_packet smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011max_allowed_packet --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011max_allowed_packet 2017-02-19 09:44:53.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011max_allowed_packet 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -max_allowed_packet=16M diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011user smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011user --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011user 2017-02-19 09:44:53.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/011user 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -user=mysql diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe 2017-03-12 21:11:47.132000000 -0400 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/my.cnf/040mysqld_safe 1969-12-31 19:00:00.000000000 -0500 @@ -1,4 +0,0 @@ - -{ # allow backwards-compatibility with safe_mysqld (mysql < 4.0) - -f "/opt/rh/rh-mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]"; -} diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/sysconfig/mysqld/10default smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/sysconfig/mysqld/10default --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/sysconfig/mysqld/10default 2017-02-19 09:44:53.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/mysql57/root/etc/sysconfig/mysqld/10default 1969-12-31 19:00:00.000000000 -0500 @@ -1,2 +0,0 @@ -socket=/var/lib/mysql/mysql57.sock -MYSQLD_OPTIONS=--skip-networking diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/000readme smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/000readme --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/000readme 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/000readme 2017-02-19 09:44:53.000000000 -0500 @@ -0,0 +1,33 @@ +########################################################### +# Here is a cheat-sheet for this file as of MySQL 4.0.14 +# 2003-12-18 - tony_clayton@mitel.com +# +# 1. The mysqld binary reads options from the [mysqld] section, +# and then overrides those values with any passed-in +# arguments. +# +# 2. The mysqld_safe script reads options from the following +# sections in order, overriding any previous values with newer +# ones: +# [mysqld] [server] [mysqld_safe] [safe_mysqld] +# It then overrides those values with any passed-in +# arguments, and invokes the mysqld binary (see #1 above) with +# the resulting argument list. +# +# * The server and safe_mysqld sections are deprecated in +# favour of mysqld and mysqld_safe respectively. +# +# 3. The mysql or mysqld initscript reads options from the +# following sections in order, overriding any previous values +# with newer ones: +# [mysqld] [mysql_server] [mysql.server] +# It then overrides those values with any passed-in arguments, +# and invokes the mysqld_safe script (see #2 above) with the +# resulting argument list. +# +# * The SMEServer doesn't have any need for initscript-only +# options, so we don't use mysql_server and mysql.server +# sections. +# +########################################################### + diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/005mysqld smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/005mysqld --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/005mysqld 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/005mysqld 2017-02-19 09:44:53.000000000 -0500 @@ -0,0 +1 @@ +[mysqld] diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006logfile smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006logfile --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006logfile 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006logfile 2017-02-19 09:44:53.000000000 -0500 @@ -0,0 +1 @@ +log-error=/var/log/mysql57-mysqld.log diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006pid-file smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006pid-file --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006pid-file 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006pid-file 2017-03-12 21:11:47.132000000 -0400 @@ -0,0 +1 @@ +pid-file=/opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/007basedir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/007basedir --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/007basedir 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/007basedir 2017-03-12 21:11:47.132000000 -0400 @@ -0,0 +1 @@ +basedir=/opt/rh/rh-mysql57/root/usr diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/008datadir --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/008datadir 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/008datadir 2017-03-12 21:11:47.132000000 -0400 @@ -0,0 +1 @@ +datadir=/opt/rh/rh-mysql57/root/var/lib/mysql diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/009socket smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/009socket --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/009socket 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/009socket 2017-02-19 09:49:56.000000000 -0500 @@ -0,0 +1,12 @@ +socket=/var/lib/mysql/mysql57.sock +{ + use esmith::ConfigDB; + my $db = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n"; + my $mysql57mysqld = $db->get('mysql57-mysqld') or die "not found"; + + my $localonly = $mysql57mysqld->prop(LocalNetworkingOnly) || "no"; + $OUT = ($localonly eq 'yes') ? "skip-networking\n" : "# networking is enabled\n"; + # define port + my $port = $mysql57mysqld->prop('port') || "3309"; + $OUT .= ($localonly eq 'yes') ? "#no port as skip-networking\n" : "port=$port\n"; +} diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/010mysqld-log-error smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/010mysqld-log-error --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/010mysqld-log-error 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/010mysqld-log-error 2017-02-19 09:44:53.000000000 -0500 @@ -0,0 +1 @@ +log-error=/var/log/mysql57-mysqld.log diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011max_allowed_packet smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011max_allowed_packet --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011max_allowed_packet 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011max_allowed_packet 2017-02-19 09:44:53.000000000 -0500 @@ -0,0 +1 @@ +max_allowed_packet=16M diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011user smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011user --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011user 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011user 2017-02-19 09:44:53.000000000 -0500 @@ -0,0 +1 @@ +user=mysql diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/040mysqld_safe smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/040mysqld_safe --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/040mysqld_safe 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/040mysqld_safe 2017-03-12 21:11:47.132000000 -0400 @@ -0,0 +1,4 @@ + +{ # allow backwards-compatibility with safe_mysqld (mysql < 4.0) + -f "/opt/rh/rh-mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]"; +} diff -Nur smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/sysconfig/mysqld/10default smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/sysconfig/mysqld/10default --- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/sysconfig/mysqld/10default 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/sysconfig/mysqld/10default 2017-02-19 09:44:53.000000000 -0500 @@ -0,0 +1,2 @@ +socket=/var/lib/mysql/mysql57.sock +MYSQLD_OPTIONS=--skip-networking diff -Nur smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/run smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run --- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/run 2017-03-12 21:11:47.133000000 -0400 +++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run 2017-03-12 21:15:13.280000000 -0400 @@ -5,14 +5,14 @@ # Since X_SCLS is cleared as well, we lose information about other # collections enabled. . /opt/rh/rh-mysql57/service-environment -for sclname in $MYSQL57_SCLS_ENABLED ; do +for sclname in $RH_MYSQL57_SCLS_ENABLED ; do . /opt/rh/$sclname/enable export X_SCLS="$X_SCLS $sclname" done # we want start daemon only inside "scl enable" invocation - if ! scl_enabled mysql57 ; then - echo "Collection mysql57 has to be listed in /opt/rh/rh-mysql57/service-environment" + if ! scl_enabled $sclname ; then + echo "Collection $sclname has to be listed in /opt/rh/rh-mysql57/service-environment" exit 1 fi diff -Nur smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks --- smeserver-mysql57-2.0.0.old/createlinks 2017-03-12 22:38:56.558000000 -0400 +++ smeserver-mysql57-2.0.0/createlinks 2017-03-12 22:41:40.305000000 -0400 @@ -54,3 +54,8 @@ "bootstrap-console-save"); safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld"); + + +# link configuration +safe_symlink("/etc/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/etc"); +safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var"); \ Pas de fin de ligne à la fin du fichier