smeserver-mysql57/contribs10/smeserver-mysql57-2.0.0-bz11877-systemd.patch

diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks
--- smeserver-mysql57-2.0.0.old/createlinks     2022-02-23 14:04:50.137000000 -0500
+++ smeserver-mysql57-2.0.0/createlinks 2022-02-23 17:16:10.633000000 -0500
@@ -31,13 +31,16 @@
 $event = "bootstrap-console-save";
 
 foreach (qw(
-       /opt/rh/rh-mysql57/root/etc/my.cnf
-       /opt/rh/rh-mysql57/root/etc/sysconfig/mysqld
-       /var/service/mysql57-mysqld/set.password
+       /etc/opt/rh/rh-mysql57/my.cnf
+       /etc/opt/rh/rh-mysql57/sysconfig/mysqld
+       /var/opt/rh/rh-mysql57/lib/mysql/set.password
+       /etc/e-smith/sql/init57/10fix_privilege_tables
        ))
-#      /root/.my.cnf
 {
-    templates2events("$_", $event);
+    templates2events("$_", qw(
+       bootstrap-console-save
+       smeserver-mysql57-update
+        ));
 }
 
 # Move all database dumps except for mysql.dump to sql/init
@@ -50,12 +53,15 @@
 
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld");
 
-templates2events("/etc/e-smith/sql/init57/10fix_privilege_tables", 
-       "bootstrap-console-save");
-
-safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld");
+$event = "smeserver-mysql57-update";
+event_link("mysql57-load-tables", $event, "40");
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld");
+# might be launched before..
+safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysql.init");
+event_link("systemd-reload", $event, "89");
+event_link("systemd-default", $event, "88");
 
 
 # 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
+safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var");
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-delete-db-files 2022-02-23 14:04:50.076000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-delete-db-files     2022-02-23 16:31:55.730000000 -0500
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-cd /opt/rh/rh-mysql57/root/var/lib/mysql && find . -type f | xargs rm -f
+cd /var/opt/rh/rh-mysql57/lib/mysql && find . -type f | xargs rm -f
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/events/actions/mysql57-load-tables     2022-02-23 14:04:50.385000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/events/actions/mysql57-load-tables 2022-02-23 16:32:24.143000000 -0500
@@ -7,7 +7,7 @@
     exit 0
 fi
 /bin/rm -f /home/e-smith/db/mysql57/information_schema.dump
-if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/mysql/user.frm ]
+if [ ! -f /var/opt/rh/rh-mysql57/lib/mysql/mysql/user.frm ]
 then
     for db in $(ls /home/e-smith/db/mysql57/*.dump 2> /dev/null | grep -v '/mysql.dump')
     do
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/000readme   2022-02-23 14:04:50.102000000 -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 --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/005mysqld smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/005mysqld
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/005mysqld       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/005mysqld   2022-02-23 14:04:50.102000000 -0500
@@ -0,0 +1 @@
+[mysqld]
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006logfile smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006logfile
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006logfile      1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006logfile  2022-02-23 14:04:50.153000000 -0500
@@ -0,0 +1,4 @@
+log-error=/var/log/mysql57-mysqld.log
+explicit_defaults_for_timestamp = 1
+log_timestamps = SYSTEM
+
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006pid-file smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006pid-file
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006pid-file     1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/006pid-file 2022-02-23 14:04:50.144000000 -0500
@@ -0,0 +1 @@
+pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/007basedir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/007basedir
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/007basedir      1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/007basedir  2022-02-23 14:04:50.103000000 -0500
@@ -0,0 +1 @@
+basedir=/opt/rh/rh-mysql57/root/usr
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir      1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir  2022-02-23 16:33:12.118000000 -0500
@@ -0,0 +1 @@
+datadir=/var/opt/rh/rh-mysql57/lib/mysql
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/0095lcmessagesdir   2022-02-23 14:04:50.144000000 -0500
@@ -0,0 +1 @@
+lc-messages-dir=/opt/rh/rh-mysql57/root/usr/share/rh-mysql57-mysql/english/
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/009socket smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/009socket
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/009socket       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/009socket   2022-02-23 14:04:50.104000000 -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 --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011max_allowed_packet smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011max_allowed_packet
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011max_allowed_packet   1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011max_allowed_packet       2022-02-23 14:04:50.135000000 -0500
@@ -0,0 +1 @@
+max_allowed_packet=16M
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011user smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011user
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011user 1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/011user     2022-02-23 14:04:50.136000000 -0500
@@ -0,0 +1 @@
+user=mysql
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/040mysqld_safe smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/040mysqld_safe
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/040mysqld_safe  1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/040mysqld_safe      2022-02-23 14:04:50.136000000 -0500
@@ -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 --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/sysconfig/mysqld/10default smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/sysconfig/mysqld/10default
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/sysconfig/mysqld/10default     1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/sysconfig/mysqld/10default 2022-02-23 14:04:50.136000000 -0500
@@ -0,0 +1,2 @@
+socket=/var/lib/mysql/mysql57.sock
+MYSQLD_OPTIONS=--skip-networking
diff -Nur --no-dereference 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  2022-02-23 14:04:50.102000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/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 --no-dereference 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  2022-02-23 14:04:50.102000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/005mysqld      1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-[mysqld]
diff -Nur --no-dereference 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 2022-02-23 14:04:50.153000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006logfile     1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-log-error=/var/log/mysql57-mysqld.log
-explicit_defaults_for_timestamp = 1
-log_timestamps = SYSTEM
-
diff -Nur --no-dereference 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        2022-02-23 14:04:50.144000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/006pid-file    1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid
diff -Nur --no-dereference 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 2022-02-23 14:04:50.103000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/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 --no-dereference 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 2022-02-23 14:04:50.104000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/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 --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/0095lcmessagesdir smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/0095lcmessagesdir
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/0095lcmessagesdir  2022-02-23 14:04:50.144000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/0095lcmessagesdir      1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-lc-messages-dir=/opt/rh/rh-mysql57/root/usr/share/rh-mysql57-mysql/english/
diff -Nur --no-dereference 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  2022-02-23 14:04:50.104000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/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 --no-dereference 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      2022-02-23 14:04:50.135000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/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 --no-dereference 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    2022-02-23 14:04:50.136000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/rh-mysql57/root/etc/my.cnf/011user        1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-user=mysql
diff -Nur --no-dereference 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     2022-02-23 14:04:50.136000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/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 --no-dereference 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        2022-02-23 14:04:50.136000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/opt/rh/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 --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates.metadata/var/opt/rh/rh-mysql57/lib/mysql/set.password smeserver-mysql57-2.0.0/root/etc/e-smith/templates.metadata/var/opt/rh/rh-mysql57/lib/mysql/set.password
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates.metadata/var/opt/rh/rh-mysql57/lib/mysql/set.password        1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates.metadata/var/opt/rh/rh-mysql57/lib/mysql/set.password    2017-02-19 09:44:53.000000000 -0500
@@ -0,0 +1 @@
+PERMS=0400
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates.metadata/var/service/mysql57-mysqld/set.password smeserver-mysql57-2.0.0/root/etc/e-smith/templates.metadata/var/service/mysql57-mysqld/set.password
--- smeserver-mysql57-2.0.0.old/root/etc/e-smith/templates.metadata/var/service/mysql57-mysqld/set.password     2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates.metadata/var/service/mysql57-mysqld/set.password 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-PERMS=0400
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/etc/rc.d/init.d/mysql57-mysql.init smeserver-mysql57-2.0.0/root/etc/rc.d/init.d/mysql57-mysql.init
--- smeserver-mysql57-2.0.0.old/root/etc/rc.d/init.d/mysql57-mysql.init 2022-02-23 14:04:50.065000000 -0500
+++ smeserver-mysql57-2.0.0/root/etc/rc.d/init.d/mysql57-mysql.init     1969-12-31 19:00:00.000000000 -0500
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-#----------------------------------------------------------------------
-# copyright (C) 2002 Mitel Networks Corporation
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-# 
-# Technical support for this program is available from Mitel Networks 
-# Please visit our web site www.mitel.com/sme/ for details.
-#----------------------------------------------------------------------
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ $# -lt 1 ]; then
-    echo "Usage: $0 <start|restart>" 1>&2
-    exit 1
-fi
-# We should only do something if $1 is 'start'.
-if [ $1 != "start" ] && [ $1 != "restart" ]; then
-    exit 0
-fi
-
-for i in $(seq 1 10)
-do
-    if test -e /var/lib/mysql/mysql.sock
-    then
-       exit_value=0
-       HOME=/root
-       export HOME
-       for link in $(find /etc/e-smith/sql/init57 -type f -o -type l | sort)
-       do
-           F=$(basename $link | sed s/S[0-9][0-9]//)
-           case $F in
-               *.sql)
-               action "Loading $F into mysql" /usr/bin/mysql < $link && /bin/rm $link
-               ;;
-               *)
-               action "Loading $F into mysql" $link && /bin/rm $link
-               ;;
-           esac
-           # Record any failure for the final return value.
-           if [ $? -ne 0 ]; then
-               exit_value=1
-           fi
-       done 
-       exit $exit_value
-    fi
-    echo "Waiting for mysql to startup" >&2
-    sleep 2
-done
-
-exit 1
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize
--- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize    1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize        2022-02-23 16:31:21.174000000 -0500
@@ -0,0 +1,32 @@
+#!/bin/bash
+datadir="/var/opt/rh/rh-mysql57/lib/mysql"
+
+if [ ! -f $datadir/mysql/user.frm ]
+then
+    touch /var/log/mysql57-mysqld.log
+    chown mysql:mysql /var/log/mysql57-mysqld.log
+    chmod 0640 /var/log/mysql57-mysqld.log
+    echo "Initializing MySQL database"
+    /opt/rh/rh-mysql57/root/usr/libexec/mysqld --initialize --datadir="$datadir" --user="mysql"
+    ret=$?
+    if [ $ret -ne 0 ] ; then
+        echo "Initialization of MySQL database failed." >&2
+        echo "Perhaps /etc/opt/rh/rh-mysql57/my.cnf is misconfigured." >&2
+        # Clean up any partially-created database files
+        if [ ! -e "$datadir/mysql/user.frm" ] ; then
+            rm -rf "$datadir"/*
+        fi
+        exit $ret
+    fi
+    # set root password
+    /opt/rh/rh-mysql57/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < $datadir/set.password
+    # upgrade does not need to be run on a fresh datadir
+    echo "5.7.24" >"$datadir/mysql_upgrade_info"
+    # In case we're running as root, make sure files are owned properly
+    chown -R "mysql:mysql" "$datadir"
+
+    if [ -f /home/e-smith/db/mysql57/mysql.dump ]
+    then
+        /sbin/e-smith/expand-template /etc/e-smith/sql/init57/00_restore_dumped_dbs
+    fi
+fi
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-mysql.init smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-mysql.init
--- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-mysql.init    1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-mysql.init        2022-02-23 14:04:50.065000000 -0500
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+#----------------------------------------------------------------------
+# copyright (C) 2002 Mitel Networks Corporation
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+# 
+# Technical support for this program is available from Mitel Networks 
+# Please visit our web site www.mitel.com/sme/ for details.
+#----------------------------------------------------------------------
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ $# -lt 1 ]; then
+    echo "Usage: $0 <start|restart>" 1>&2
+    exit 1
+fi
+# We should only do something if $1 is 'start'.
+if [ $1 != "start" ] && [ $1 != "restart" ]; then
+    exit 0
+fi
+
+for i in $(seq 1 10)
+do
+    if test -e /var/lib/mysql/mysql.sock
+    then
+       exit_value=0
+       HOME=/root
+       export HOME
+       for link in $(find /etc/e-smith/sql/init57 -type f -o -type l | sort)
+       do
+           F=$(basename $link | sed s/S[0-9][0-9]//)
+           case $F in
+               *.sql)
+               action "Loading $F into mysql" /usr/bin/mysql < $link && /bin/rm $link
+               ;;
+               *)
+               action "Loading $F into mysql" $link && /bin/rm $link
+               ;;
+           esac
+           # Record any failure for the final return value.
+           if [ $? -ne 0 ]; then
+               exit_value=1
+           fi
+       done 
+       exit $exit_value
+    fi
+    echo "Waiting for mysql to startup" >&2
+    sleep 2
+done
+
+exit 1
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/usr/lib/systemd/system/mysql57-mysql.init.service smeserver-mysql57-2.0.0/root/usr/lib/systemd/system/mysql57-mysql.init.service
--- smeserver-mysql57-2.0.0.old/root/usr/lib/systemd/system/mysql57-mysql.init.service  1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/usr/lib/systemd/system/mysql57-mysql.init.service      2022-02-23 15:38:51.471000000 -0500
@@ -0,0 +1,20 @@
+[Unit]
+SourcePath=/sbin/e-smith/systemd/mysql57-mysql.init
+Description=Koozali SME Server mysql DB injector for mysql57
+After=mysql57-mysql.service
+Requires=mysql57-mysql.service
+
+[Service]
+Type=oneshot
+Restart=no
+TimeoutSec=10min
+IgnoreSIGPIPE=no
+KillMode=process
+GuessMainPID=no
+RemainAfterExit=yes
+ExecStart=/sbin/e-smith/systemd/mysql57-mysql.init start
+ExecStop=/sbin/e-smith/systemd/mysql57-mysql.init stop
+
+[Install]
+WantedBy=sme-server.target
+
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/usr/lib/systemd/system/mysql57-mysql.service smeserver-mysql57-2.0.0/root/usr/lib/systemd/system/mysql57-mysql.service
--- smeserver-mysql57-2.0.0.old/root/usr/lib/systemd/system/mysql57-mysql.service       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/usr/lib/systemd/system/mysql57-mysql.service   2022-02-23 15:24:21.955000000 -0500
@@ -0,0 +1,50 @@
+[Unit]
+Description=MySQL 5.7 database server
+After=syslog.target
+After=network.target
+
+[Service]
+Type=simple
+User=root
+Group=root
+
+#ours : we need root user as + and ! are not yet supported
+ExecStartPre=-/sbin/e-smith/service-status mariadb
+ExecStartPre=-/sbin/e-smith/expand-template /var/opt/rh/rh-mysql57/lib/mysql/set.password
+ExecStartPre=-/sbin/e-smith/expand-template /root/.my.cnf
+ExecStartPre=-/sbin/e-smith/expand-template /etc/opt/rh/rh-mysql57/my.cnf
+ExecStartPre=/sbin/e-smith/systemd/mysql57-initialize
+
+# We want to start server only inside "scl enable" invocation
+ExecStartPre=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /usr/bin/scl_enabled rh-mysql57
+ExecStartPre=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-check-socket
+ExecStartPre=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-prepare-db-dir %n
+
+# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
+# per bug #547485
+ExecStart=/opt/rh/rh-mysql57/root/usr/libexec/mysqld-scl-helper enable $RH_MYSQL57_SCLS_ENABLED -- \
+       /opt/rh/rh-mysql57/root/usr/libexec/mysqld \
+       --defaults-file= /etc/opt/rh/rh-mysql57/my.cnf
+       --datadir=/var/opt/rh/rh-mysql57/lib/mysql \
+       --user=mysql \
+       --daemonize \
+       --basedir=/opt/rh/rh-mysql57/root/usr \
+       --pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid
+
+ExecStartPost=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-check-upgrade
+ExecStopPost=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-wait-stop
+
+#ExecStartPost=/usr/libexec/mariadb-wait-ready $MAINPID
+
+# Give a reasonable amount of time for the server to start up/shut down
+TimeoutSec=300
+
+# Place temp files in a secure directory, not /tmp
+PrivateTmp=true
+
+Restart=on-failure
+
+RestartPreventExitStatus=1
+
+[Install]
+WantedBy=sme-server.target
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/d smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/d
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/d       2022-02-23 14:04:50.091000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/d   1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/i smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/i
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/i       2022-02-23 14:04:50.092000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/i   1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -INT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/q smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/q
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/q       2022-02-23 14:04:50.092000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/q   1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -QUIT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/t smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/t
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/t       2022-02-23 14:04:50.093000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/t   1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid)
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/log/run smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/log/run
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/log/run 2017-02-19 09:44:53.000000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/log/run     1969-12-31 19:00:00.000000000 -0500
@@ -1,26 +0,0 @@
-#!/bin/sh
- 
- #----------------------------------------------------------------------
- # copyright (C) 2003 Mitel Networks Corporation
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- #
- # Technical support for this program is available from Mitel Networks
- # Please visit our web site www.mitel.com/sme/ for details.
- #----------------------------------------------------------------------
- exec                                    \
-     /usr/local/bin/setuidgid smelog     \
-     /usr/local/bin/multilog t s5000000  \
-     /var/log/mysql57-mysqld
diff -Nur --no-dereference 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     2022-02-23 14:04:50.154000000 -0500
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run 1969-12-31 19:00:00.000000000 -0500
@@ -1,60 +0,0 @@
-#! /bin/sh
-
-datadir="/opt/rh/rh-mysql57/root/var/lib/mysql"
-
-# We have to re-enable SCL environment, because /sbin/service
-# clears almost all environment variables.
-# Since X_SCLS is cleared as well, we lose information about other
-# collections enabled.
-. /opt/rh/rh-mysql57/service-environment
-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 $sclname ; then
-    echo "Collection $sclname has to be listed in /opt/rh/rh-mysql57/service-environment"
-    exit 1
-fi
-
-exec 2>&1
-
-if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/mysql/user.frm ]
-then
-    touch /var/log/mysql57-mysqld.log
-    chown mysql:mysql /var/log/mysql57-mysqld.log
-    chmod 0640 /var/log/mysql57-mysqld.log
-    echo "Initializing MySQL database"
-    /opt/rh/rh-mysql57/root/usr/libexec/mysqld --initialize --datadir="$datadir" --user="mysql"
-    ret=$?
-    if [ $ret -ne 0 ] ; then
-        echo "Initialization of MySQL database failed." >&2
-        echo "Perhaps /etc/opt/rh/rh-mysql57/my.cnf is misconfigured." >&2
-        # Clean up any partially-created database files
-        if [ ! -e "$datadir/mysql/user.frm" ] ; then
-            rm -rf "$datadir"/*
-        fi
-        exit $ret
-    fi
-    # set root password
-    /opt/rh/rh-mysql57/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < ./set.password
-    # upgrade does not need to be run on a fresh datadir
-    echo "5.7.16" >"$datadir/mysql_upgrade_info"
-    # In case we're running as root, make sure files are owned properly
-    chown -R "mysql:mysql" "$datadir"
-
-    if [ -f /home/e-smith/db/mysql57/mysql.dump ]
-    then
-       /sbin/e-smith/expand-template /etc/e-smith/sql/init57/00_restore_dumped_dbs
-    fi
-fi
-
-exec /opt/rh/rh-mysql57/root/usr/libexec/mysqld \
- --defaults-file=/opt/rh/rh-mysql57/root/etc/my.cnf \
-  --basedir=/opt/rh/rh-mysql57/root/usr \
-   --datadir=$datadir \
-    --user=mysql \
-     --pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid \
-      --socket=/var/lib/mysql/mysql57.sock \
-       --lc-messages-dir=/opt/rh/rh-mysql57/root/usr/share/rh-mysql57-mysql/english/