/[smecontribs]/rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-support.patch
ViewVC logotype

Contents of /rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-support.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Tue May 31 14:44:08 2022 UTC (2 years, 5 months ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-automysqlbackup-3_0_RC6-22_el7_sme
Changes since 1.1: +8 -8 lines 
* Tue May 31 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-22.sme
- Fix more typos in templates [SME: 11970]
1 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/createlinks smeserver-automysqlbackup-3.0.RC6/createlinks
2 --- smeserver-automysqlbackup-3.0.RC6.old/createlinks 2022-05-09 14:20:32.643461677 +0100
3 +++ smeserver-automysqlbackup-3.0.RC6/createlinks 2022-05-09 14:55:43.029190340 +0100
4 @@ -10,8 +10,11 @@
5 foreach (qw(
6 /etc/cron.d/runmysqlbackup
7 /etc/automysqlbackup/myserver.conf
8 - /etc/automysqlbackup/mysql55.conf
9 /etc/automysqlbackup/mysql57.conf
10 + /etc/automysqlbackup/mysql101.conf
11 + /etc/automysqlbackup/mysql102.conf
12 + /etc/automysqlbackup/mysql103.conf
13 + /etc/automysqlbackup/mysql105.conf
14 /etc/automysqlbackup/mymaria.conf
15 /etc/e-smith/sql/init/automysqlbackup
16 ))
17 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/10start
18 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/10start 1970-01-01 01:00:00.000000000 +0100
19 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/10start 2022-05-09 14:28:22.662198871 +0100
20 @@ -0,0 +1,20 @@
21 +{
22 +my $mymaria = ${'mariadb101-mariadb'}{'status'} || 'disabled';
23 +my $myauto = ${'automysqlbackup'}{'Mymaria101'} || 'enabled';
24 +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled';
25 +
26 +if ($status eq 'enabled') {
27 +$OUT .= <<'_EOF';
28 +#version=3.0_rc2
29 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
30 +CONFIG_mysql_dump_username='backupuser'
31 +CONFIG_mysql_dump_password=$PWDMYSQL
32 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
33 +_EOF
34 +}
35 +else {
36 +$OUT .= "#version=3.0_rc2\n";
37 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
38 +$OUT .= "# Automysqlbackup disabled\n";
39 +}
40 +}
41 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/20db
42 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/20db 1970-01-01 01:00:00.000000000 +0100
43 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/20db 2022-05-09 14:20:32.640461627 +0100
44 @@ -0,0 +1,12 @@
45 +{
46 +if ($status eq 'enabled') {
47 +$OUT .= <<'_EOF';
48 +# DB Specific
49 +CONFIG_backup_dir=${BACKUPDIR}_mymaria
50 +CONFIG_mysql_dump_full_schema='no'
51 +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' )
52 +CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb101.sock'
53 +# End
54 +_EOF
55 +}
56 +}
57 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/30end
58 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/30end 1970-01-01 01:00:00.000000000 +0100
59 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/30end 2022-05-09 14:20:32.640461627 +0100
60 @@ -0,0 +1,14 @@
61 +{
62 +if ($status eq 'enabled') {
63 +$OUT .= <<'_EOF';
64 +CONFIG_mailcontent=$MAILCONTENT
65 +CONFIG_mail_maxattsize=$SIZEMAIL
66 +CONFIG_mail_splitandtar='yes'
67 +CONFIG_mail_address=$MAILTO
68 +CONFIG_encrypt=$ENCRYPT
69 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
70 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
71 +umask 0077
72 +_EOF
73 +}
74 +}
75 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/10start
76 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/10start 1970-01-01 01:00:00.000000000 +0100
77 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/10start 2022-05-09 14:29:20.750155084 +0100
78 @@ -0,0 +1,20 @@
79 +{
80 +my $mymaria = ${'mariadb102-mariadb'}{'status'} || 'disabled';
81 +my $myauto = ${'automysqlbackup'}{'Mymaria102'} || 'enabled';
82 +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled';
83 +
84 +if ($status eq 'enabled') {
85 +$OUT .= <<'_EOF';
86 +#version=3.0_rc2
87 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
88 +CONFIG_mysql_dump_username='backupuser'
89 +CONFIG_mysql_dump_password=$PWDMYSQL
90 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
91 +_EOF
92 +}
93 +else {
94 +$OUT .= "#version=3.0_rc2\n";
95 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
96 +$OUT .= "# Automysqlbackup disabled\n";
97 +}
98 +}
99 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/20db
100 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/20db 1970-01-01 01:00:00.000000000 +0100
101 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/20db 2022-05-09 14:20:32.640461627 +0100
102 @@ -0,0 +1,12 @@
103 +{
104 +if ($status eq 'enabled') {
105 +$OUT .= <<'_EOF';
106 +# DB Specific
107 +CONFIG_backup_dir=${BACKUPDIR}_mymaria
108 +CONFIG_mysql_dump_full_schema='no'
109 +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' )
110 +CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb102.sock'
111 +# End
112 +_EOF
113 +}
114 +}
115 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/30end
116 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/30end 1970-01-01 01:00:00.000000000 +0100
117 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/30end 2022-05-09 14:20:32.640461627 +0100
118 @@ -0,0 +1,14 @@
119 +{
120 +if ($status eq 'enabled') {
121 +$OUT .= <<'_EOF';
122 +CONFIG_mailcontent=$MAILCONTENT
123 +CONFIG_mail_maxattsize=$SIZEMAIL
124 +CONFIG_mail_splitandtar='yes'
125 +CONFIG_mail_address=$MAILTO
126 +CONFIG_encrypt=$ENCRYPT
127 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
128 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
129 +umask 0077
130 +_EOF
131 +}
132 +}
133 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/10start
134 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/10start 1970-01-01 01:00:00.000000000 +0100
135 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/10start 2022-05-09 14:29:37.342428217 +0100
136 @@ -0,0 +1,20 @@
137 +{
138 +my $mymaria = ${'mariadb103-mariadb'}{'status'} || 'disabled';
139 +my $myauto = ${'automysqlbackup'}{'Mymaria103'} || 'enabled';
140 +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled';
141 +
142 +if ($status eq 'enabled') {
143 +$OUT .= <<'_EOF';
144 +#version=3.0_rc2
145 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
146 +CONFIG_mysql_dump_username='backupuser'
147 +CONFIG_mysql_dump_password=$PWDMYSQL
148 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
149 +_EOF
150 +}
151 +else {
152 +$OUT .= "#version=3.0_rc2\n";
153 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
154 +$OUT .= "# Automysqlbackup disabled\n";
155 +}
156 +}
157 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/20db
158 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/20db 1970-01-01 01:00:00.000000000 +0100
159 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/20db 2022-05-09 14:20:32.640461627 +0100
160 @@ -0,0 +1,12 @@
161 +{
162 +if ($status eq 'enabled') {
163 +$OUT .= <<'_EOF';
164 +# DB Specific
165 +CONFIG_backup_dir=${BACKUPDIR}_mymaria
166 +CONFIG_mysql_dump_full_schema='no'
167 +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' )
168 +CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb103.sock'
169 +# End
170 +_EOF
171 +}
172 +}
173 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/30end
174 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/30end 1970-01-01 01:00:00.000000000 +0100
175 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/30end 2022-05-09 14:20:32.640461627 +0100
176 @@ -0,0 +1,14 @@
177 +{
178 +if ($status eq 'enabled') {
179 +$OUT .= <<'_EOF';
180 +CONFIG_mailcontent=$MAILCONTENT
181 +CONFIG_mail_maxattsize=$SIZEMAIL
182 +CONFIG_mail_splitandtar='yes'
183 +CONFIG_mail_address=$MAILTO
184 +CONFIG_encrypt=$ENCRYPT
185 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
186 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
187 +umask 0077
188 +_EOF
189 +}
190 +}
191 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/10start
192 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/10start 1970-01-01 01:00:00.000000000 +0100
193 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/10start 2022-05-09 14:29:56.013735574 +0100
194 @@ -0,0 +1,20 @@
195 +{
196 +my $mymaria = ${'mariadb105-mariadb'}{'status'} || 'disabled';
197 +my $myauto = ${'automysqlbackup'}{'Mymaria105'} || 'enabled';
198 +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled';
199 +
200 +if ($status eq 'enabled') {
201 +$OUT .= <<'_EOF';
202 +#version=3.0_rc2
203 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
204 +CONFIG_mysql_dump_username='backupuser'
205 +CONFIG_mysql_dump_password=$PWDMYSQL
206 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
207 +_EOF
208 +}
209 +else {
210 +$OUT .= "#version=3.0_rc2\n";
211 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
212 +$OUT .= "# Automysqlbackup disabled\n";
213 +}
214 +}
215 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/20db
216 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/20db 1970-01-01 01:00:00.000000000 +0100
217 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/20db 2022-05-09 14:20:32.640461627 +0100
218 @@ -0,0 +1,12 @@
219 +{
220 +if ($status eq 'enabled') {
221 +$OUT .= <<'_EOF';
222 +# DB Specific
223 +CONFIG_backup_dir=${BACKUPDIR}_mymaria
224 +CONFIG_mysql_dump_full_schema='no'
225 +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' )
226 +CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb105.sock'
227 +# End
228 +_EOF
229 +}
230 +}
231 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/30end
232 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/30end 1970-01-01 01:00:00.000000000 +0100
233 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/30end 2022-05-09 14:20:32.640461627 +0100
234 @@ -0,0 +1,14 @@
235 +{
236 +if ($status eq 'enabled') {
237 +$OUT .= <<'_EOF';
238 +CONFIG_mailcontent=$MAILCONTENT
239 +CONFIG_mail_maxattsize=$SIZEMAIL
240 +CONFIG_mail_splitandtar='yes'
241 +CONFIG_mail_address=$MAILTO
242 +CONFIG_encrypt=$ENCRYPT
243 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
244 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
245 +umask 0077
246 +_EOF
247 +}
248 +}
249 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start
250 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start 2022-05-09 14:20:32.640461627 +0100
251 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start 1970-01-01 01:00:00.000000000 +0100
252 @@ -1,19 +0,0 @@
253 -{
254 -my $my51 = ${'mysqld'}{'status'} || 'disabled';
255 -my $myauto = ${'automysqlbackup'}{'Mysql51'} || 'enabled';
256 -if ($my51 eq 'enabled' && $myauto eq 'enabled') {
257 -$OUT .= <<'_EOF';
258 -#version=3.0_rc2
259 -# DONT'T REMOVE THE PREVIOUS VERSION LINE!
260 -CONFIG_mysql_dump_username='backupuser'
261 -CONFIG_mysql_dump_password=$PWDMYSQL
262 -CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
263 -CONFIG_backup_dir=$BACKUPDIR
264 -_EOF
265 -}
266 -else {
267 -$OUT .= "#version=3.0_rc2\n";
268 -$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
269 -$OUT .= "# Automysqlbackup disabled\n";
270 -}
271 -}
272 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db
273 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db 2022-05-09 14:20:32.640461627 +0100
274 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db 1970-01-01 01:00:00.000000000 +0100
275 @@ -1,7 +0,0 @@
276 -{
277 -my $my51 = ${'mysqld'}{'status'} || 'disabled';
278 -my $myauto = ${'automysqlbackup'}{'Mysql51'} || 'enabled';
279 -if ($my51 eq 'enabled' && $myauto eq 'enabled') {
280 -$OUT .= "CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock'\n";
281 -}
282 -}
283 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end
284 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end 2022-05-09 14:20:32.640461627 +0100
285 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end 1970-01-01 01:00:00.000000000 +0100
286 @@ -1,16 +0,0 @@
287 -{
288 -my $my51 = ${'mysqld'}{'status'} || 'disabled';
289 -my $myauto = ${'automysqlbackup'}{'Mysql51'} || 'enabled';
290 -if ($my51 eq 'enabled' && $myauto eq 'enabled') {
291 -$OUT .= <<'_EOF';
292 -CONFIG_mailcontent=$MAILCONTENT
293 -CONFIG_mail_maxattsize=$SIZEMAIL
294 -CONFIG_mail_splitandtar='yes'
295 -CONFIG_mail_address=$MAILTO
296 -CONFIG_encrypt=$ENCRYPT
297 -CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
298 -CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
299 -umask 0077
300 -_EOF
301 -}
302 -}
303 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start
304 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start 2022-05-09 14:20:32.640461627 +0100
305 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start 1970-01-01 01:00:00.000000000 +0100
306 @@ -1,20 +0,0 @@
307 -{
308 -my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled';
309 -my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'enabled';
310 -our $status = ( $my55 eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled';
311 -
312 -if ($status eq 'enabled') {
313 -$OUT .= <<'_EOF';
314 -#version=3.0_rc2
315 -# DONT'T REMOVE THE PREVIOUS VERSION LINE!
316 -CONFIG_mysql_dump_username='backupuser'
317 -CONFIG_mysql_dump_password=$PWDMYSQL
318 -CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
319 -_EOF
320 -}
321 -else {
322 -$OUT .= "#version=3.0_rc2\n";
323 -$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
324 -$OUT .= "# Automysqlbackup disabled\n";
325 -}
326 -}
327 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db
328 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db 2022-05-09 14:20:32.640461627 +0100
329 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db 1970-01-01 01:00:00.000000000 +0100
330 @@ -1,12 +0,0 @@
331 -{
332 -if ($status eq 'enabled') {
333 -$OUT .= <<'_EOF';
334 -# DB Specific
335 -CONFIG_backup_dir=${BACKUPDIR}_mysql55
336 -CONFIG_mysql_dump_full_schema='no'
337 -CONFIG_db_exclude=( 'information_schema' 'performance_schema' 'sys' )
338 -CONFIG_mysql_dump_socket='/var/lib/mysql/mysql55.sock'
339 -# End
340 -_EOF
341 -}
342 -}
343 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end
344 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end 2022-05-09 14:20:32.640461627 +0100
345 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end 1970-01-01 01:00:00.000000000 +0100
346 @@ -1,14 +0,0 @@
347 -{
348 -if ($status eq 'enabled') {
349 -$OUT .= <<'_EOF';
350 -CONFIG_mailcontent=$MAILCONTENT
351 -CONFIG_mail_maxattsize=$SIZEMAIL
352 -CONFIG_mail_splitandtar='yes'
353 -CONFIG_mail_address=$MAILTO
354 -CONFIG_encrypt=$ENCRYPT
355 -CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
356 -CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
357 -umask 0077
358 -_EOF
359 -}
360 -}
361 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init101/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init101/automysqlbackup
362 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init101/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
363 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init101/automysqlbackup 2022-05-09 14:40:48.725472924 +0100
364 @@ -0,0 +1,43 @@
365 +{
366 +my $user = $automysqlbackup{'DbUser'} || 'backupuser';
367 +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup';
368 +my $status = ${'mariadb101-mariadb'}{'status'} || 'disabled';
369 +
370 +$OUT = "#! /bin/sh
371 +";
372 +
373 +if ( "$status" eq "enabled" ) {
374 +
375 +$OUT .= <<"END";
376 +HOME="/root/";
377 +/opt/rh/rh-mariadb101/root/usr/bin/mysql --socket=/var/lib/mysql/mariadb101.sock <<EOF
378 +USE mysql;
379 +
380 +REPLACE INTO user (
381 + host,
382 + user,
383 + authentication_string,
384 + ssl_cipher,
385 + x509_issuer,
386 + x509_subject)
387 + VALUES (
388 + 'localhost',
389 + '$user',
390 + PASSWORD ('$pass'),
391 + '',
392 + '',
393 + '');
394 +
395 +
396 +REVOKE ALL PRIVILEGES ON *.* FROM '$user'\@'localhost';
397 +REVOKE GRANT OPTION ON *.* FROM '$user'\@'localhost';
398 +GRANT EVENT,SELECT,LOCK TABLES, SHOW VIEW ON *.* TO '$user'\@'localhost' ;
399 +
400 +
401 +FLUSH PRIVILEGES;
402 +EOF
403 +END
404 +}
405 +
406 +}
407 +
408 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init102/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init102/automysqlbackup
409 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init102/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
410 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init102/automysqlbackup 2022-05-09 14:41:50.021481110 +0100
411 @@ -0,0 +1,43 @@
412 +{
413 +my $user = $automysqlbackup{'DbUser'} || 'backupuser';
414 +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup';
415 +my $status = ${'mariadb102-mariadb'}{'status'} || 'disabled';
416 +
417 +$OUT = "#! /bin/sh
418 +";
419 +
420 +if ( "$status" eq "enabled" ) {
421 +
422 +$OUT .= <<"END";
423 +HOME="/root/";
424 +/opt/rh/rh-mariadb102/root/usr/bin/mysql --socket=/var/lib/mysql/mariadb102.sock <<EOF
425 +USE mysql;
426 +
427 +REPLACE INTO user (
428 + host,
429 + user,
430 + authentication_string,
431 + ssl_cipher,
432 + x509_issuer,
433 + x509_subject)
434 + VALUES (
435 + 'localhost',
436 + '$user',
437 + PASSWORD ('$pass'),
438 + '',
439 + '',
440 + '');
441 +
442 +
443 +REVOKE ALL PRIVILEGES ON *.* FROM '$user'\@'localhost';
444 +REVOKE GRANT OPTION ON *.* FROM '$user'\@'localhost';
445 +GRANT EVENT,SELECT,LOCK TABLES, SHOW VIEW ON *.* TO '$user'\@'localhost' ;
446 +
447 +
448 +FLUSH PRIVILEGES;
449 +EOF
450 +END
451 +}
452 +
453 +}
454 +
455 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init103/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init103/automysqlbackup
456 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init103/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
457 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init103/automysqlbackup 2022-05-09 14:42:15.989908234 +0100
458 @@ -0,0 +1,43 @@
459 +{
460 +my $user = $automysqlbackup{'DbUser'} || 'backupuser';
461 +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup';
462 +my $status = ${'mariadb103-mariadb'}{'status'} || 'disabled';
463 +
464 +$OUT = "#! /bin/sh
465 +";
466 +
467 +if ( "$status" eq "enabled" ) {
468 +
469 +$OUT .= <<"END";
470 +HOME="/root/";
471 +/opt/rh/rh-mariadb103/root/usr/bin/mysql --socket=/var/lib/mysql/mariadb103.sock <<EOF
472 +USE mysql;
473 +
474 +REPLACE INTO user (
475 + host,
476 + user,
477 + authentication_string,
478 + ssl_cipher,
479 + x509_issuer,
480 + x509_subject)
481 + VALUES (
482 + 'localhost',
483 + '$user',
484 + PASSWORD ('$pass'),
485 + '',
486 + '',
487 + '');
488 +
489 +
490 +REVOKE ALL PRIVILEGES ON *.* FROM '$user'\@'localhost';
491 +REVOKE GRANT OPTION ON *.* FROM '$user'\@'localhost';
492 +GRANT EVENT,SELECT,LOCK TABLES, SHOW VIEW ON *.* TO '$user'\@'localhost' ;
493 +
494 +
495 +FLUSH PRIVILEGES;
496 +EOF
497 +END
498 +}
499 +
500 +}
501 +
502 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup
503 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
504 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup 2022-05-09 14:42:45.773398108 +0100
505 @@ -0,0 +1,43 @@
506 +{
507 +my $user = $automysqlbackup{'DbUser'} || 'backupuser';
508 +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup';
509 +my $status = ${'mariadb105-mariadb'}{'status'} || 'disabled';
510 +
511 +$OUT = "#! /bin/sh
512 +";
513 +
514 +if ( "$status" eq "enabled" ) {
515 +
516 +$OUT .= <<"END";
517 +HOME="/root/";
518 +/opt/rh/rh-mariadb105/root/usr/bin/mysql --socket=/var/lib/mysql/mariadb105.sock <<EOF
519 +USE mysql;
520 +
521 +REPLACE INTO user (
522 + host,
523 + user,
524 + authentication_string,
525 + ssl_cipher,
526 + x509_issuer,
527 + x509_subject)
528 + VALUES (
529 + 'localhost',
530 + '$user',
531 + PASSWORD ('$pass'),
532 + '',
533 + '',
534 + '');
535 +
536 +
537 +REVOKE ALL PRIVILEGES ON *.* FROM '$user'\@'localhost';
538 +REVOKE GRANT OPTION ON *.* FROM '$user'\@'localhost';
539 +GRANT EVENT,SELECT,LOCK TABLES, SHOW VIEW ON *.* TO '$user'\@'localhost' ;
540 +
541 +
542 +FLUSH PRIVILEGES;
543 +EOF
544 +END
545 +}
546 +
547 +}
548 +
549 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init101/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init101/automysqlbackup
550 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init101/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
551 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init101/automysqlbackup 2022-05-09 14:20:32.641461644 +0100
552 @@ -0,0 +1 @@
553 +PERMS=0750
554 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init102/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init102/automysqlbackup
555 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init102/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
556 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init102/automysqlbackup 2022-05-09 14:20:32.641461644 +0100
557 @@ -0,0 +1 @@
558 +PERMS=0750
559 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init103/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init103/automysqlbackup
560 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init103/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
561 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init103/automysqlbackup 2022-05-09 14:20:32.641461644 +0100
562 @@ -0,0 +1 @@
563 +PERMS=0750
564 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/automysqlbackup
565 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/automysqlbackup 1970-01-01 01:00:00.000000000 +0100
566 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init105/automysqlbackup 2022-05-09 14:20:32.641461644 +0100
567 @@ -0,0 +1 @@
568 +PERMS=0750
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed