1 |
jpp |
1.1 |
diff -Nur --no-dereference smeserver-mysql57-2.0.0.old/createlinks smeserver-mysql57-2.0.0/createlinks |
2 |
|
|
--- smeserver-mysql57-2.0.0.old/createlinks 2022-02-23 14:04:50.137000000 -0500 |
3 |
|
|
+++ smeserver-mysql57-2.0.0/createlinks 2022-02-23 15:15:13.931000000 -0500 |
4 |
|
|
@@ -31,13 +31,16 @@ |
5 |
|
|
$event = "bootstrap-console-save"; |
6 |
|
|
|
7 |
|
|
foreach (qw( |
8 |
|
|
- /opt/rh/rh-mysql57/root/etc/my.cnf |
9 |
|
|
- /opt/rh/rh-mysql57/root/etc/sysconfig/mysqld |
10 |
|
|
- /var/service/mysql57-mysqld/set.password |
11 |
|
|
+ /etc/opt/rh/rh-mysql57/my.cnf |
12 |
|
|
+ /etc/opt/rh/rh-mysql57/sysconfig/mysqld |
13 |
|
|
+ /var/opt/rh/rh-mysql57/lib/mysql/set.password |
14 |
|
|
+ /etc/e-smith/sql/init57/10fix_privilege_tables |
15 |
|
|
)) |
16 |
|
|
-# /root/.my.cnf |
17 |
|
|
{ |
18 |
|
|
- templates2events("$_", $event); |
19 |
|
|
+ templates2events("$_", qw( |
20 |
|
|
+ bootstrap-console-save |
21 |
|
|
+ smeserver-mysql57-update |
22 |
|
|
+ )); |
23 |
|
|
} |
24 |
|
|
|
25 |
|
|
# Move all database dumps except for mysql.dump to sql/init |
26 |
|
|
@@ -50,12 +53,9 @@ |
27 |
|
|
|
28 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql57-mysqld"); |
29 |
|
|
|
30 |
|
|
-templates2events("/etc/e-smith/sql/init57/10fix_privilege_tables", |
31 |
|
|
- "bootstrap-console-save"); |
32 |
|
|
- |
33 |
|
|
-safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld"); |
34 |
|
|
- |
35 |
|
|
+#safe_symlink("/opt/rh/rh-mysql57/root/var/run/mysqld", "root/var/run/mysql57-mysqld"); |
36 |
|
|
+#/var/run/rh-mysql57-mysqld/ |
37 |
|
|
|
38 |
|
|
# link configuration |
39 |
|
|
safe_symlink("/etc/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/etc"); |
40 |
|
|
-safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var"); |
41 |
|
|
\ Pas de fin de ligne à la fin du fichier |
42 |
|
|
+safe_symlink("/var/opt/rh/rh-mysql57", "root/opt/rh/rh-mysql57/root/var"); |
43 |
|
|
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 |
44 |
|
|
--- 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 |
45 |
|
|
+++ 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 |
46 |
|
|
@@ -0,0 +1,33 @@ |
47 |
|
|
+########################################################### |
48 |
|
|
+# Here is a cheat-sheet for this file as of MySQL 4.0.14 |
49 |
|
|
+# 2003-12-18 - tony_clayton@mitel.com |
50 |
|
|
+# |
51 |
|
|
+# 1. The mysqld binary reads options from the [mysqld] section, |
52 |
|
|
+# and then overrides those values with any passed-in |
53 |
|
|
+# arguments. |
54 |
|
|
+# |
55 |
|
|
+# 2. The mysqld_safe script reads options from the following |
56 |
|
|
+# sections in order, overriding any previous values with newer |
57 |
|
|
+# ones: |
58 |
|
|
+# [mysqld] [server] [mysqld_safe] [safe_mysqld] |
59 |
|
|
+# It then overrides those values with any passed-in |
60 |
|
|
+# arguments, and invokes the mysqld binary (see #1 above) with |
61 |
|
|
+# the resulting argument list. |
62 |
|
|
+# |
63 |
|
|
+# * The server and safe_mysqld sections are deprecated in |
64 |
|
|
+# favour of mysqld and mysqld_safe respectively. |
65 |
|
|
+# |
66 |
|
|
+# 3. The mysql or mysqld initscript reads options from the |
67 |
|
|
+# following sections in order, overriding any previous values |
68 |
|
|
+# with newer ones: |
69 |
|
|
+# [mysqld] [mysql_server] [mysql.server] |
70 |
|
|
+# It then overrides those values with any passed-in arguments, |
71 |
|
|
+# and invokes the mysqld_safe script (see #2 above) with the |
72 |
|
|
+# resulting argument list. |
73 |
|
|
+# |
74 |
|
|
+# * The SMEServer doesn't have any need for initscript-only |
75 |
|
|
+# options, so we don't use mysql_server and mysql.server |
76 |
|
|
+# sections. |
77 |
|
|
+# |
78 |
|
|
+########################################################### |
79 |
|
|
+ |
80 |
|
|
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 |
81 |
|
|
--- 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 |
82 |
|
|
+++ 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 |
83 |
|
|
@@ -0,0 +1 @@ |
84 |
|
|
+[mysqld] |
85 |
|
|
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 |
86 |
|
|
--- 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 |
87 |
|
|
+++ 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 |
88 |
|
|
@@ -0,0 +1,4 @@ |
89 |
|
|
+log-error=/var/log/mysql57-mysqld.log |
90 |
|
|
+explicit_defaults_for_timestamp = 1 |
91 |
|
|
+log_timestamps = SYSTEM |
92 |
|
|
+ |
93 |
|
|
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 |
94 |
|
|
--- 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 |
95 |
|
|
+++ 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 |
96 |
|
|
@@ -0,0 +1 @@ |
97 |
|
|
+pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid |
98 |
|
|
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 |
99 |
|
|
--- 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 |
100 |
|
|
+++ 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 |
101 |
|
|
@@ -0,0 +1 @@ |
102 |
|
|
+basedir=/opt/rh/rh-mysql57/root/usr |
103 |
|
|
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 |
104 |
|
|
--- 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 |
105 |
|
|
+++ smeserver-mysql57-2.0.0/root/etc/e-smith/templates/etc/opt/rh/rh-mysql57/my.cnf/008datadir 2022-02-23 14:04:50.104000000 -0500 |
106 |
|
|
@@ -0,0 +1 @@ |
107 |
|
|
+datadir=/opt/rh/rh-mysql57/root/var/lib/mysql |
108 |
|
|
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 |
109 |
|
|
--- 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 |
110 |
|
|
+++ 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 |
111 |
|
|
@@ -0,0 +1 @@ |
112 |
|
|
+lc-messages-dir=/opt/rh/rh-mysql57/root/usr/share/rh-mysql57-mysql/english/ |
113 |
|
|
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 |
114 |
|
|
--- 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 |
115 |
|
|
+++ 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 |
116 |
|
|
@@ -0,0 +1,12 @@ |
117 |
|
|
+socket=/var/lib/mysql/mysql57.sock |
118 |
|
|
+{ |
119 |
|
|
+ use esmith::ConfigDB; |
120 |
|
|
+ my $db = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n"; |
121 |
|
|
+ my $mysql57mysqld = $db->get('mysql57-mysqld') or die "not found"; |
122 |
|
|
+ |
123 |
|
|
+ my $localonly = $mysql57mysqld->prop(LocalNetworkingOnly) || "no"; |
124 |
|
|
+ $OUT = ($localonly eq 'yes') ? "skip-networking\n" : "# networking is enabled\n"; |
125 |
|
|
+ # define port |
126 |
|
|
+ my $port = $mysql57mysqld->prop('port') || "3309"; |
127 |
|
|
+ $OUT .= ($localonly eq 'yes') ? "#no port as skip-networking\n" : "port=$port\n"; |
128 |
|
|
+} |
129 |
|
|
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 |
130 |
|
|
--- 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 |
131 |
|
|
+++ 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 |
132 |
|
|
@@ -0,0 +1 @@ |
133 |
|
|
+max_allowed_packet=16M |
134 |
|
|
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 |
135 |
|
|
--- 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 |
136 |
|
|
+++ 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 |
137 |
|
|
@@ -0,0 +1 @@ |
138 |
|
|
+user=mysql |
139 |
|
|
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 |
140 |
|
|
--- 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 |
141 |
|
|
+++ 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 |
142 |
|
|
@@ -0,0 +1,4 @@ |
143 |
|
|
+ |
144 |
|
|
+{ # allow backwards-compatibility with safe_mysqld (mysql < 4.0) |
145 |
|
|
+ -f "/opt/rh/rh-mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]"; |
146 |
|
|
+} |
147 |
|
|
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 |
148 |
|
|
--- 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 |
149 |
|
|
+++ 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 |
150 |
|
|
@@ -0,0 +1,2 @@ |
151 |
|
|
+socket=/var/lib/mysql/mysql57.sock |
152 |
|
|
+MYSQLD_OPTIONS=--skip-networking |
153 |
|
|
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 |
154 |
|
|
--- 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 |
155 |
|
|
+++ 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 |
156 |
|
|
@@ -1,33 +0,0 @@ |
157 |
|
|
-########################################################### |
158 |
|
|
-# Here is a cheat-sheet for this file as of MySQL 4.0.14 |
159 |
|
|
-# 2003-12-18 - tony_clayton@mitel.com |
160 |
|
|
-# |
161 |
|
|
-# 1. The mysqld binary reads options from the [mysqld] section, |
162 |
|
|
-# and then overrides those values with any passed-in |
163 |
|
|
-# arguments. |
164 |
|
|
-# |
165 |
|
|
-# 2. The mysqld_safe script reads options from the following |
166 |
|
|
-# sections in order, overriding any previous values with newer |
167 |
|
|
-# ones: |
168 |
|
|
-# [mysqld] [server] [mysqld_safe] [safe_mysqld] |
169 |
|
|
-# It then overrides those values with any passed-in |
170 |
|
|
-# arguments, and invokes the mysqld binary (see #1 above) with |
171 |
|
|
-# the resulting argument list. |
172 |
|
|
-# |
173 |
|
|
-# * The server and safe_mysqld sections are deprecated in |
174 |
|
|
-# favour of mysqld and mysqld_safe respectively. |
175 |
|
|
-# |
176 |
|
|
-# 3. The mysql or mysqld initscript reads options from the |
177 |
|
|
-# following sections in order, overriding any previous values |
178 |
|
|
-# with newer ones: |
179 |
|
|
-# [mysqld] [mysql_server] [mysql.server] |
180 |
|
|
-# It then overrides those values with any passed-in arguments, |
181 |
|
|
-# and invokes the mysqld_safe script (see #2 above) with the |
182 |
|
|
-# resulting argument list. |
183 |
|
|
-# |
184 |
|
|
-# * The SMEServer doesn't have any need for initscript-only |
185 |
|
|
-# options, so we don't use mysql_server and mysql.server |
186 |
|
|
-# sections. |
187 |
|
|
-# |
188 |
|
|
-########################################################### |
189 |
|
|
- |
190 |
|
|
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 |
191 |
|
|
--- 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 |
192 |
|
|
+++ 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 |
193 |
|
|
@@ -1 +0,0 @@ |
194 |
|
|
-[mysqld] |
195 |
|
|
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 |
196 |
|
|
--- 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 |
197 |
|
|
+++ 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 |
198 |
|
|
@@ -1,4 +0,0 @@ |
199 |
|
|
-log-error=/var/log/mysql57-mysqld.log |
200 |
|
|
-explicit_defaults_for_timestamp = 1 |
201 |
|
|
-log_timestamps = SYSTEM |
202 |
|
|
- |
203 |
|
|
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 |
204 |
|
|
--- 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 |
205 |
|
|
+++ 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 |
206 |
|
|
@@ -1 +0,0 @@ |
207 |
|
|
-pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid |
208 |
|
|
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 |
209 |
|
|
--- 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 |
210 |
|
|
+++ 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 |
211 |
|
|
@@ -1 +0,0 @@ |
212 |
|
|
-basedir=/opt/rh/rh-mysql57/root/usr |
213 |
|
|
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 |
214 |
|
|
--- 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 |
215 |
|
|
+++ 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 |
216 |
|
|
@@ -1 +0,0 @@ |
217 |
|
|
-datadir=/opt/rh/rh-mysql57/root/var/lib/mysql |
218 |
|
|
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 |
219 |
|
|
--- 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 |
220 |
|
|
+++ 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 |
221 |
|
|
@@ -1 +0,0 @@ |
222 |
|
|
-lc-messages-dir=/opt/rh/rh-mysql57/root/usr/share/rh-mysql57-mysql/english/ |
223 |
|
|
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 |
224 |
|
|
--- 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 |
225 |
|
|
+++ 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 |
226 |
|
|
@@ -1,12 +0,0 @@ |
227 |
|
|
-socket=/var/lib/mysql/mysql57.sock |
228 |
|
|
-{ |
229 |
|
|
- use esmith::ConfigDB; |
230 |
|
|
- my $db = esmith::ConfigDB->open or die "Couldn't open ConfigDB\n"; |
231 |
|
|
- my $mysql57mysqld = $db->get('mysql57-mysqld') or die "not found"; |
232 |
|
|
- |
233 |
|
|
- my $localonly = $mysql57mysqld->prop(LocalNetworkingOnly) || "no"; |
234 |
|
|
- $OUT = ($localonly eq 'yes') ? "skip-networking\n" : "# networking is enabled\n"; |
235 |
|
|
- # define port |
236 |
|
|
- my $port = $mysql57mysqld->prop('port') || "3309"; |
237 |
|
|
- $OUT .= ($localonly eq 'yes') ? "#no port as skip-networking\n" : "port=$port\n"; |
238 |
|
|
-} |
239 |
|
|
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 |
240 |
|
|
--- 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 |
241 |
|
|
+++ 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 |
242 |
|
|
@@ -1 +0,0 @@ |
243 |
|
|
-max_allowed_packet=16M |
244 |
|
|
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 |
245 |
|
|
--- 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 |
246 |
|
|
+++ 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 |
247 |
|
|
@@ -1 +0,0 @@ |
248 |
|
|
-user=mysql |
249 |
|
|
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 |
250 |
|
|
--- 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 |
251 |
|
|
+++ 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 |
252 |
|
|
@@ -1,4 +0,0 @@ |
253 |
|
|
- |
254 |
|
|
-{ # allow backwards-compatibility with safe_mysqld (mysql < 4.0) |
255 |
|
|
- -f "/opt/rh/rh-mysql57/root/usr/bin/mysqld_safe" ? "[mysqld_safe]" : "[safe_mysqld]"; |
256 |
|
|
-} |
257 |
|
|
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 |
258 |
|
|
--- 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 |
259 |
|
|
+++ 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 |
260 |
|
|
@@ -1,2 +0,0 @@ |
261 |
|
|
-socket=/var/lib/mysql/mysql57.sock |
262 |
|
|
-MYSQLD_OPTIONS=--skip-networking |
263 |
|
|
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 |
264 |
|
|
--- 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 |
265 |
|
|
+++ 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 |
266 |
|
|
@@ -0,0 +1 @@ |
267 |
|
|
+PERMS=0400 |
268 |
|
|
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 |
269 |
|
|
--- 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 |
270 |
|
|
+++ 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 |
271 |
|
|
@@ -1 +0,0 @@ |
272 |
|
|
-PERMS=0400 |
273 |
|
|
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 |
274 |
|
|
--- smeserver-mysql57-2.0.0.old/root/etc/rc.d/init.d/mysql57-mysql.init 2022-02-23 14:04:50.065000000 -0500 |
275 |
|
|
+++ smeserver-mysql57-2.0.0/root/etc/rc.d/init.d/mysql57-mysql.init 1969-12-31 19:00:00.000000000 -0500 |
276 |
|
|
@@ -1,65 +0,0 @@ |
277 |
|
|
-#!/bin/sh |
278 |
|
|
- |
279 |
|
|
-#---------------------------------------------------------------------- |
280 |
|
|
-# copyright (C) 2002 Mitel Networks Corporation |
281 |
|
|
-# |
282 |
|
|
-# This program is free software; you can redistribute it and/or modify |
283 |
|
|
-# it under the terms of the GNU General Public License as published by |
284 |
|
|
-# the Free Software Foundation; either version 2 of the License, or |
285 |
|
|
-# (at your option) any later version. |
286 |
|
|
-# |
287 |
|
|
-# This program is distributed in the hope that it will be useful, |
288 |
|
|
-# but WITHOUT ANY WARRANTY; without even the implied warranty of |
289 |
|
|
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
290 |
|
|
-# GNU General Public License for more details. |
291 |
|
|
-# |
292 |
|
|
-# You should have received a copy of the GNU General Public License |
293 |
|
|
-# along with this program; if not, write to the Free Software |
294 |
|
|
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
295 |
|
|
-# |
296 |
|
|
-# Technical support for this program is available from Mitel Networks |
297 |
|
|
-# Please visit our web site www.mitel.com/sme/ for details. |
298 |
|
|
-#---------------------------------------------------------------------- |
299 |
|
|
- |
300 |
|
|
-# Source function library. |
301 |
|
|
-. /etc/rc.d/init.d/functions |
302 |
|
|
- |
303 |
|
|
-if [ $# -lt 1 ]; then |
304 |
|
|
- echo "Usage: $0 <start|restart>" 1>&2 |
305 |
|
|
- exit 1 |
306 |
|
|
-fi |
307 |
|
|
-# We should only do something if $1 is 'start'. |
308 |
|
|
-if [ $1 != "start" ] && [ $1 != "restart" ]; then |
309 |
|
|
- exit 0 |
310 |
|
|
-fi |
311 |
|
|
- |
312 |
|
|
-for i in $(seq 1 10) |
313 |
|
|
-do |
314 |
|
|
- if test -e /var/lib/mysql/mysql.sock |
315 |
|
|
- then |
316 |
|
|
- exit_value=0 |
317 |
|
|
- HOME=/root |
318 |
|
|
- export HOME |
319 |
|
|
- for link in $(find /etc/e-smith/sql/init57 -type f -o -type l | sort) |
320 |
|
|
- do |
321 |
|
|
- F=$(basename $link | sed s/S[0-9][0-9]//) |
322 |
|
|
- case $F in |
323 |
|
|
- *.sql) |
324 |
|
|
- action "Loading $F into mysql" /usr/bin/mysql < $link && /bin/rm $link |
325 |
|
|
- ;; |
326 |
|
|
- *) |
327 |
|
|
- action "Loading $F into mysql" $link && /bin/rm $link |
328 |
|
|
- ;; |
329 |
|
|
- esac |
330 |
|
|
- # Record any failure for the final return value. |
331 |
|
|
- if [ $? -ne 0 ]; then |
332 |
|
|
- exit_value=1 |
333 |
|
|
- fi |
334 |
|
|
- done |
335 |
|
|
- exit $exit_value |
336 |
|
|
- fi |
337 |
|
|
- echo "Waiting for mysql to startup" >&2 |
338 |
|
|
- sleep 2 |
339 |
|
|
-done |
340 |
|
|
- |
341 |
|
|
-exit 1 |
342 |
|
|
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 |
343 |
|
|
--- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-initialize 1969-12-31 19:00:00.000000000 -0500 |
344 |
|
|
+++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-initialize 2022-02-23 15:34:09.812000000 -0500 |
345 |
|
|
@@ -0,0 +1,32 @@ |
346 |
|
|
+#!/bin/bash |
347 |
|
|
+datadir="/opt/rh/rh-mysql57/root/var/lib/mysql" |
348 |
|
|
+ |
349 |
|
|
+if [ ! -f /var/opt/rh/rh-mysql57/lib/mysql/mysql/user.frm ] |
350 |
|
|
+then |
351 |
|
|
+ touch /var/log/mysql57-mysqld.log |
352 |
|
|
+ chown mysql:mysql /var/log/mysql57-mysqld.log |
353 |
|
|
+ chmod 0640 /var/log/mysql57-mysqld.log |
354 |
|
|
+ echo "Initializing MySQL database" |
355 |
|
|
+ /opt/rh/rh-mysql57/root/usr/libexec/mysqld --initialize --datadir="$datadir" --user="mysql" |
356 |
|
|
+ ret=$? |
357 |
|
|
+ if [ $ret -ne 0 ] ; then |
358 |
|
|
+ echo "Initialization of MySQL database failed." >&2 |
359 |
|
|
+ echo "Perhaps /etc/opt/rh/rh-mysql57/my.cnf is misconfigured." >&2 |
360 |
|
|
+ # Clean up any partially-created database files |
361 |
|
|
+ if [ ! -e "$datadir/mysql/user.frm" ] ; then |
362 |
|
|
+ rm -rf "$datadir"/* |
363 |
|
|
+ fi |
364 |
|
|
+ exit $ret |
365 |
|
|
+ fi |
366 |
|
|
+ # set root password |
367 |
|
|
+ /opt/rh/rh-mysql57/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < $datadir/set.password |
368 |
|
|
+ # upgrade does not need to be run on a fresh datadir |
369 |
|
|
+ echo "5.7.24" >"$datadir/mysql_upgrade_info" |
370 |
|
|
+ # In case we're running as root, make sure files are owned properly |
371 |
|
|
+ chown -R "mysql:mysql" "$datadir" |
372 |
|
|
+ |
373 |
|
|
+ if [ -f /home/e-smith/db/mysql57/mysql.dump ] |
374 |
|
|
+ then |
375 |
|
|
+ /sbin/e-smith/expand-template /etc/e-smith/sql/init57/00_restore_dumped_dbs |
376 |
|
|
+ fi |
377 |
|
|
+fi |
378 |
|
|
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 |
379 |
|
|
--- smeserver-mysql57-2.0.0.old/root/sbin/e-smith/systemd/mysql57-mysql.init 1969-12-31 19:00:00.000000000 -0500 |
380 |
|
|
+++ smeserver-mysql57-2.0.0/root/sbin/e-smith/systemd/mysql57-mysql.init 2022-02-23 14:04:50.065000000 -0500 |
381 |
|
|
@@ -0,0 +1,65 @@ |
382 |
|
|
+#!/bin/sh |
383 |
|
|
+ |
384 |
|
|
+#---------------------------------------------------------------------- |
385 |
|
|
+# copyright (C) 2002 Mitel Networks Corporation |
386 |
|
|
+# |
387 |
|
|
+# This program is free software; you can redistribute it and/or modify |
388 |
|
|
+# it under the terms of the GNU General Public License as published by |
389 |
|
|
+# the Free Software Foundation; either version 2 of the License, or |
390 |
|
|
+# (at your option) any later version. |
391 |
|
|
+# |
392 |
|
|
+# This program is distributed in the hope that it will be useful, |
393 |
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of |
394 |
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
395 |
|
|
+# GNU General Public License for more details. |
396 |
|
|
+# |
397 |
|
|
+# You should have received a copy of the GNU General Public License |
398 |
|
|
+# along with this program; if not, write to the Free Software |
399 |
|
|
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
400 |
|
|
+# |
401 |
|
|
+# Technical support for this program is available from Mitel Networks |
402 |
|
|
+# Please visit our web site www.mitel.com/sme/ for details. |
403 |
|
|
+#---------------------------------------------------------------------- |
404 |
|
|
+ |
405 |
|
|
+# Source function library. |
406 |
|
|
+. /etc/rc.d/init.d/functions |
407 |
|
|
+ |
408 |
|
|
+if [ $# -lt 1 ]; then |
409 |
|
|
+ echo "Usage: $0 <start|restart>" 1>&2 |
410 |
|
|
+ exit 1 |
411 |
|
|
+fi |
412 |
|
|
+# We should only do something if $1 is 'start'. |
413 |
|
|
+if [ $1 != "start" ] && [ $1 != "restart" ]; then |
414 |
|
|
+ exit 0 |
415 |
|
|
+fi |
416 |
|
|
+ |
417 |
|
|
+for i in $(seq 1 10) |
418 |
|
|
+do |
419 |
|
|
+ if test -e /var/lib/mysql/mysql.sock |
420 |
|
|
+ then |
421 |
|
|
+ exit_value=0 |
422 |
|
|
+ HOME=/root |
423 |
|
|
+ export HOME |
424 |
|
|
+ for link in $(find /etc/e-smith/sql/init57 -type f -o -type l | sort) |
425 |
|
|
+ do |
426 |
|
|
+ F=$(basename $link | sed s/S[0-9][0-9]//) |
427 |
|
|
+ case $F in |
428 |
|
|
+ *.sql) |
429 |
|
|
+ action "Loading $F into mysql" /usr/bin/mysql < $link && /bin/rm $link |
430 |
|
|
+ ;; |
431 |
|
|
+ *) |
432 |
|
|
+ action "Loading $F into mysql" $link && /bin/rm $link |
433 |
|
|
+ ;; |
434 |
|
|
+ esac |
435 |
|
|
+ # Record any failure for the final return value. |
436 |
|
|
+ if [ $? -ne 0 ]; then |
437 |
|
|
+ exit_value=1 |
438 |
|
|
+ fi |
439 |
|
|
+ done |
440 |
|
|
+ exit $exit_value |
441 |
|
|
+ fi |
442 |
|
|
+ echo "Waiting for mysql to startup" >&2 |
443 |
|
|
+ sleep 2 |
444 |
|
|
+done |
445 |
|
|
+ |
446 |
|
|
+exit 1 |
447 |
|
|
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 |
448 |
|
|
--- smeserver-mysql57-2.0.0.old/root/usr/lib/systemd/system/mysql57-mysql.init.service 1969-12-31 19:00:00.000000000 -0500 |
449 |
|
|
+++ smeserver-mysql57-2.0.0/root/usr/lib/systemd/system/mysql57-mysql.init.service 2022-02-23 15:38:51.471000000 -0500 |
450 |
|
|
@@ -0,0 +1,20 @@ |
451 |
|
|
+[Unit] |
452 |
|
|
+SourcePath=/sbin/e-smith/systemd/mysql57-mysql.init |
453 |
|
|
+Description=Koozali SME Server mysql DB injector for mysql57 |
454 |
|
|
+After=mysql57-mysql.service |
455 |
|
|
+Requires=mysql57-mysql.service |
456 |
|
|
+ |
457 |
|
|
+[Service] |
458 |
|
|
+Type=oneshot |
459 |
|
|
+Restart=no |
460 |
|
|
+TimeoutSec=10min |
461 |
|
|
+IgnoreSIGPIPE=no |
462 |
|
|
+KillMode=process |
463 |
|
|
+GuessMainPID=no |
464 |
|
|
+RemainAfterExit=yes |
465 |
|
|
+ExecStart=/sbin/e-smith/systemd/mysql57-mysql.init start |
466 |
|
|
+ExecStop=/sbin/e-smith/systemd/mysql57-mysql.init stop |
467 |
|
|
+ |
468 |
|
|
+[Install] |
469 |
|
|
+WantedBy=sme-server.target |
470 |
|
|
+ |
471 |
|
|
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 |
472 |
|
|
--- smeserver-mysql57-2.0.0.old/root/usr/lib/systemd/system/mysql57-mysql.service 1969-12-31 19:00:00.000000000 -0500 |
473 |
|
|
+++ smeserver-mysql57-2.0.0/root/usr/lib/systemd/system/mysql57-mysql.service 2022-02-23 15:24:21.955000000 -0500 |
474 |
|
|
@@ -0,0 +1,50 @@ |
475 |
|
|
+[Unit] |
476 |
|
|
+Description=MySQL 5.7 database server |
477 |
|
|
+After=syslog.target |
478 |
|
|
+After=network.target |
479 |
|
|
+ |
480 |
|
|
+[Service] |
481 |
|
|
+Type=simple |
482 |
|
|
+User=root |
483 |
|
|
+Group=root |
484 |
|
|
+ |
485 |
|
|
+#ours : we need root user as + and ! are not yet supported |
486 |
|
|
+ExecStartPre=-/sbin/e-smith/service-status mariadb |
487 |
|
|
+ExecStartPre=-/sbin/e-smith/expand-template /var/opt/rh/rh-mysql57/lib/mysql/set.password |
488 |
|
|
+ExecStartPre=-/sbin/e-smith/expand-template /root/.my.cnf |
489 |
|
|
+ExecStartPre=-/sbin/e-smith/expand-template /etc/opt/rh/rh-mysql57/my.cnf |
490 |
|
|
+ExecStartPre=/sbin/e-smith/systemd/mysql57-initialize |
491 |
|
|
+ |
492 |
|
|
+# We want to start server only inside "scl enable" invocation |
493 |
|
|
+ExecStartPre=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /usr/bin/scl_enabled rh-mysql57 |
494 |
|
|
+ExecStartPre=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-check-socket |
495 |
|
|
+ExecStartPre=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-prepare-db-dir %n |
496 |
|
|
+ |
497 |
|
|
+# Note: we set --basedir to prevent probes that might trigger SELinux alarms, |
498 |
|
|
+# per bug #547485 |
499 |
|
|
+ExecStart=/opt/rh/rh-mysql57/root/usr/libexec/mysqld-scl-helper enable $RH_MYSQL57_SCLS_ENABLED -- \ |
500 |
|
|
+ /opt/rh/rh-mysql57/root/usr/libexec/mysqld \ |
501 |
|
|
+ --defaults-file= /etc/opt/rh/rh-mysql57/my.cnf |
502 |
|
|
+ --datadir=/var/opt/rh/rh-mysql57/lib/mysql \ |
503 |
|
|
+ --user=mysql \ |
504 |
|
|
+ --daemonize \ |
505 |
|
|
+ --basedir=/opt/rh/rh-mysql57/root/usr \ |
506 |
|
|
+ --pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid |
507 |
|
|
+ |
508 |
|
|
+ExecStartPost=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-check-upgrade |
509 |
|
|
+ExecStopPost=/usr/bin/scl enable $RH_MYSQL57_SCLS_ENABLED -- /opt/rh/rh-mysql57/root/usr/libexec/mysql-wait-stop |
510 |
|
|
+ |
511 |
|
|
+#ExecStartPost=/usr/libexec/mariadb-wait-ready $MAINPID |
512 |
|
|
+ |
513 |
|
|
+# Give a reasonable amount of time for the server to start up/shut down |
514 |
|
|
+TimeoutSec=300 |
515 |
|
|
+ |
516 |
|
|
+# Place temp files in a secure directory, not /tmp |
517 |
|
|
+PrivateTmp=true |
518 |
|
|
+ |
519 |
|
|
+Restart=on-failure |
520 |
|
|
+ |
521 |
|
|
+RestartPreventExitStatus=1 |
522 |
|
|
+ |
523 |
|
|
+[Install] |
524 |
|
|
+WantedBy=sme-server.target |
525 |
|
|
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 |
526 |
|
|
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/d 2022-02-23 14:04:50.091000000 -0500 |
527 |
|
|
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/d 1969-12-31 19:00:00.000000000 -0500 |
528 |
|
|
@@ -1,3 +0,0 @@ |
529 |
|
|
-#! /bin/sh |
530 |
|
|
- |
531 |
|
|
-exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) |
532 |
|
|
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 |
533 |
|
|
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/i 2022-02-23 14:04:50.092000000 -0500 |
534 |
|
|
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/i 1969-12-31 19:00:00.000000000 -0500 |
535 |
|
|
@@ -1,3 +0,0 @@ |
536 |
|
|
-#! /bin/sh |
537 |
|
|
- |
538 |
|
|
-exec kill -INT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) |
539 |
|
|
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 |
540 |
|
|
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/q 2022-02-23 14:04:50.092000000 -0500 |
541 |
|
|
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/q 1969-12-31 19:00:00.000000000 -0500 |
542 |
|
|
@@ -1,3 +0,0 @@ |
543 |
|
|
-#! /bin/sh |
544 |
|
|
- |
545 |
|
|
-exec kill -QUIT $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) |
546 |
|
|
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 |
547 |
|
|
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/control/t 2022-02-23 14:04:50.093000000 -0500 |
548 |
|
|
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/control/t 1969-12-31 19:00:00.000000000 -0500 |
549 |
|
|
@@ -1,3 +0,0 @@ |
550 |
|
|
-#! /bin/sh |
551 |
|
|
- |
552 |
|
|
-exec kill -TERM $(cat /opt/rh/rh-mysql57/root/var/run/mysqld/mysqld.pid) |
553 |
|
|
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 |
554 |
|
|
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/log/run 2017-02-19 09:44:53.000000000 -0500 |
555 |
|
|
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/log/run 1969-12-31 19:00:00.000000000 -0500 |
556 |
|
|
@@ -1,26 +0,0 @@ |
557 |
|
|
-#!/bin/sh |
558 |
|
|
- |
559 |
|
|
- #---------------------------------------------------------------------- |
560 |
|
|
- # copyright (C) 2003 Mitel Networks Corporation |
561 |
|
|
- # |
562 |
|
|
- # This program is free software; you can redistribute it and/or modify |
563 |
|
|
- # it under the terms of the GNU General Public License as published by |
564 |
|
|
- # the Free Software Foundation; either version 2 of the License, or |
565 |
|
|
- # (at your option) any later version. |
566 |
|
|
- # |
567 |
|
|
- # This program is distributed in the hope that it will be useful, |
568 |
|
|
- # but WITHOUT ANY WARRANTY; without even the implied warranty of |
569 |
|
|
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
570 |
|
|
- # GNU General Public License for more details. |
571 |
|
|
- # |
572 |
|
|
- # You should have received a copy of the GNU General Public License |
573 |
|
|
- # along with this program; if not, write to the Free Software |
574 |
|
|
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
575 |
|
|
- # |
576 |
|
|
- # Technical support for this program is available from Mitel Networks |
577 |
|
|
- # Please visit our web site www.mitel.com/sme/ for details. |
578 |
|
|
- #---------------------------------------------------------------------- |
579 |
|
|
- exec \ |
580 |
|
|
- /usr/local/bin/setuidgid smelog \ |
581 |
|
|
- /usr/local/bin/multilog t s5000000 \ |
582 |
|
|
- /var/log/mysql57-mysqld |
583 |
|
|
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 |
584 |
|
|
--- smeserver-mysql57-2.0.0.old/root/var/service/mysql57-mysqld/run 2022-02-23 14:04:50.154000000 -0500 |
585 |
|
|
+++ smeserver-mysql57-2.0.0/root/var/service/mysql57-mysqld/run 1969-12-31 19:00:00.000000000 -0500 |
586 |
|
|
@@ -1,60 +0,0 @@ |
587 |
|
|
-#! /bin/sh |
588 |
|
|
- |
589 |
|
|
-datadir="/opt/rh/rh-mysql57/root/var/lib/mysql" |
590 |
|
|
- |
591 |
|
|
-# We have to re-enable SCL environment, because /sbin/service |
592 |
|
|
-# clears almost all environment variables. |
593 |
|
|
-# Since X_SCLS is cleared as well, we lose information about other |
594 |
|
|
-# collections enabled. |
595 |
|
|
-. /opt/rh/rh-mysql57/service-environment |
596 |
|
|
-for sclname in $RH_MYSQL57_SCLS_ENABLED ; do |
597 |
|
|
- . /opt/rh/$sclname/enable |
598 |
|
|
- export X_SCLS="$X_SCLS $sclname" |
599 |
|
|
-done |
600 |
|
|
- |
601 |
|
|
-# we want start daemon only inside "scl enable" invocation |
602 |
|
|
-if ! scl_enabled $sclname ; then |
603 |
|
|
- echo "Collection $sclname has to be listed in /opt/rh/rh-mysql57/service-environment" |
604 |
|
|
- exit 1 |
605 |
|
|
-fi |
606 |
|
|
- |
607 |
|
|
-exec 2>&1 |
608 |
|
|
- |
609 |
|
|
-if [ ! -f /opt/rh/rh-mysql57/root/var/lib/mysql/mysql/user.frm ] |
610 |
|
|
-then |
611 |
|
|
- touch /var/log/mysql57-mysqld.log |
612 |
|
|
- chown mysql:mysql /var/log/mysql57-mysqld.log |
613 |
|
|
- chmod 0640 /var/log/mysql57-mysqld.log |
614 |
|
|
- echo "Initializing MySQL database" |
615 |
|
|
- /opt/rh/rh-mysql57/root/usr/libexec/mysqld --initialize --datadir="$datadir" --user="mysql" |
616 |
|
|
- ret=$? |
617 |
|
|
- if [ $ret -ne 0 ] ; then |
618 |
|
|
- echo "Initialization of MySQL database failed." >&2 |
619 |
|
|
- echo "Perhaps /etc/opt/rh/rh-mysql57/my.cnf is misconfigured." >&2 |
620 |
|
|
- # Clean up any partially-created database files |
621 |
|
|
- if [ ! -e "$datadir/mysql/user.frm" ] ; then |
622 |
|
|
- rm -rf "$datadir"/* |
623 |
|
|
- fi |
624 |
|
|
- exit $ret |
625 |
|
|
- fi |
626 |
|
|
- # set root password |
627 |
|
|
- /opt/rh/rh-mysql57/root/usr/libexec/mysqld --bootstrap --datadir="$datadir" --user="mysql" < ./set.password |
628 |
|
|
- # upgrade does not need to be run on a fresh datadir |
629 |
|
|
- echo "5.7.16" >"$datadir/mysql_upgrade_info" |
630 |
|
|
- # In case we're running as root, make sure files are owned properly |
631 |
|
|
- chown -R "mysql:mysql" "$datadir" |
632 |
|
|
- |
633 |
|
|
- if [ -f /home/e-smith/db/mysql57/mysql.dump ] |
634 |
|
|
- then |
635 |
|
|
- /sbin/e-smith/expand-template /etc/e-smith/sql/init57/00_restore_dumped_dbs |
636 |
|
|
- fi |
637 |
|
|
-fi |
638 |
|
|
- |
639 |
|
|
-exec /opt/rh/rh-mysql57/root/usr/libexec/mysqld \ |
640 |
|
|
- --defaults-file=/opt/rh/rh-mysql57/root/etc/my.cnf \ |
641 |
|
|
- --basedir=/opt/rh/rh-mysql57/root/usr \ |
642 |
|
|
- --datadir=$datadir \ |
643 |
|
|
- --user=mysql \ |
644 |
|
|
- --pid-file=/var/run/rh-mysql57-mysqld/mysqld.pid \ |
645 |
|
|
- --socket=/var/lib/mysql/mysql57.sock \ |
646 |
|
|
- --lc-messages-dir=/opt/rh/rh-mysql57/root/usr/share/rh-mysql57-mysql/english/ |