/[smecontribs]/rpms/smeserver-automysqlbackup/contribs9/smeserver-automysqlbackup-enhanced-templates.patch
ViewVC logotype

Contents of /rpms/smeserver-automysqlbackup/contribs9/smeserver-automysqlbackup-enhanced-templates.patch

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


Revision 1.1 - (show annotations) (download)
Wed Jul 11 23:03:51 2018 UTC (6 years, 3 months ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-automysqlbackup-3_0_RC6-15_el6_sme, smeserver-automysqlbackup-3_0_RC6-10_el6_sme, smeserver-automysqlbackup-3_0_RC6-12_el6_sme, smeserver-automysqlbackup-3_0_RC6-11_el6_sme, smeserver-automysqlbackup-3_0_RC6-14_el6_sme, smeserver-automysqlbackup-3_0_RC6-13_el6_sme, smeserver-automysqlbackup-3_0_RC6-9_el6_sme, HEAD
* Fri Jul 06 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.RC6-9.sme
- Template configuration files
- run automysqlbackup per conf directly from cron rather than runmysqlbackup
- Add extra DB keys for mysql53, mysql55, mysql57

1 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/createlinks smeserver-automysqlbackup-3.0.RC6/createlinks
2 --- smeserver-automysqlbackup-3.0.RC6.old/createlinks 2018-07-06 11:54:05.456758697 +0200
3 +++ smeserver-automysqlbackup-3.0.RC6/createlinks 2018-07-09 14:13:37.532047394 +0200
4 @@ -6,11 +6,21 @@
5 # links to add
6
7 # templates to expand
8 -for my $event (qw(
9 -bootstrap-console-save
10 -console-save
11 -automysqlbackup-update
12 -))
13 +
14 +foreach (qw(
15 + /etc/cron.d/runmysqlbackup
16 + /etc/automysqlbackup/myserver.conf
17 + /etc/automysqlbackup/mysql55.conf
18 + /etc/automysqlbackup/mysql57.conf
19 + /etc/automysqlbackup/mymaria.conf
20 +
21 + ))
22 {
23 - templates2events( "/etc/cron.d/runmysqlbackup" , $event );
24 + templates2events(
25 + "$_", qw(
26 + automysqlbackup-update
27 + console-save
28 + bootstrap-console-save
29 + )
30 + );
31 }
32 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/automysqlbackup/myserver.conf smeserver-automysqlbackup-3.0.RC6/root/etc/automysqlbackup/myserver.conf
33 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/automysqlbackup/myserver.conf 2018-07-06 11:54:05.432757518 +0200
34 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/automysqlbackup/myserver.conf 1970-01-01 01:00:00.000000000 +0100
35 @@ -1,261 +0,0 @@
36 -#version=3.0_rc2
37 -# DONT'T REMOVE THE PREVIOUS VERSION LINE!
38 -#
39 -# Uncomment to change the default values (shown after =)
40 -# WARNING:
41 -# This is not true for UMASK, CONFIG_prebackup and CONFIG_postbackup!!!
42 -#
43 -# Default values are stored in the script itself. Declarations in
44 -# /etc/automysqlbackup/automysqlbackup.conf will overwrite them. The
45 -# declarations in here will supersede all other.
46 -
47 -# Edit $PATH if mysql and mysqldump are not located in /usr/local/bin:/usr/bin:/bin:/usr/local/mysql/bin
48 -#PATH=${PATH}:FULL_PATH_TO_YOUR_DIR_CONTAINING_MYSQL:FULL_PATH_TO_YOUR_DIR_CONTAINING_MYSQLDUMP
49 -
50 -# Basic Settings
51 -
52 -# Username to access the MySQL server e.g. dbuser
53 -CONFIG_mysql_dump_username='backupuser'
54 -
55 -# Password to access the MySQL server e.g. password
56 -CONFIG_mysql_dump_password=$PWDMYSQL
57 -
58 -# Host name (or IP address) of MySQL server e.g localhost
59 -#CONFIG_mysql_dump_host='localhost'
60 -
61 -# "Friendly" host name of MySQL server to be used in email log
62 -# if unset or empty (default) will use CONFIG_mysql_dump_host instead
63 -CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
64 -
65 -# Backup directory location e.g /backups
66 -CONFIG_backup_dir=$BACKUPDIR
67 -
68 -# This is practically a moot point, since there is a fallback to the compression
69 -# functions without multicore support in the case that the multicore versions aren't
70 -# present in the system. Of course, if you have the latter installed, but don't want
71 -# to use them, just choose no here.
72 -# pigz -> gzip
73 -# pbzip2 -> bzip2
74 -#CONFIG_multicore='yes'
75 -
76 -# Number of threads (= occupied cores) you want to use. You should - for the sake
77 -# of the stability of your system - not choose more than (#number of cores - 1).
78 -# Especially if the script is run in background by cron and the rest of your system
79 -# has already heavy load, setting this too high, might crash your system. Assuming
80 -# all systems have at least some sort of HyperThreading, the default is 2 threads.
81 -# If you wish to let pigz and pbzip2 autodetect or use their standards, set it to
82 -# 'auto'.
83 -#CONFIG_multicore_threads=2
84 -
85 -# Databases to backup
86 -
87 -# List of databases for Daily/Weekly Backup e.g. ( 'DB1' 'DB2' 'DB3' ... )
88 -# set to (), i.e. empty, if you want to backup all databases
89 -#CONFIG_db_names=()
90 -# You can use
91 -#declare -a MDBNAMES=( "${DBNAMES[@]}" 'added entry1' 'added entry2' ... )
92 -# INSTEAD to copy the contents of $DBNAMES and add further entries (optional).
93 -
94 -# List of databases for Monthly Backups.
95 -# set to (), i.e. empty, if you want to backup all databases
96 -#CONFIG_db_month_names=()
97 -
98 -# List of DBNAMES to EXLUCDE if DBNAMES is empty, i.e. ().
99 -#CONFIG_db_exclude=( 'information_schema' )
100 -
101 -# List of tables to exclude, in the form db_name.table_name
102 -# You may use wildcards for the table names, i.e. 'mydb.a*' selects all tables starting with an 'a'.
103 -# However we only offer the wildcard '*', matching everything that could appear, which translates to the
104 -# '%' wildcard in mysql.
105 -#CONFIG_table_exclude=()
106 -
107 -
108 -# Advanced Settings
109 -
110 -# Rotation Settings
111 -
112 -# Which day do you want monthly backups? (01 to 31)
113 -# If the chosen day is greater than the last day of the month, it will be done
114 -# on the last day of the month.
115 -# Set to 0 to disable monthly backups.
116 -#CONFIG_do_monthly="01"
117 -
118 -# Which day do you want weekly backups? (1 to 7 where 1 is Monday)
119 -# Set to 0 to disable weekly backups.
120 -#CONFIG_do_weekly="5"
121 -
122 -# Set rotation of daily backups. VALUE*24hours
123 -# If you want to keep only today's backups, you could choose 1, i.e. everything older than 24hours will be removed.
124 -#CONFIG_rotation_daily=6
125 -
126 -# Set rotation for weekly backups. VALUE*24hours
127 -#CONFIG_rotation_weekly=35
128 -
129 -# Set rotation for monthly backups. VALUE*24hours
130 -#CONFIG_rotation_monthly=150
131 -
132 -
133 -# Server Connection Settings
134 -
135 -# Set the port for the mysql connection
136 -#CONFIG_mysql_dump_port=3306
137 -
138 -# Compress communications between backup server and MySQL server?
139 -#CONFIG_mysql_dump_commcomp='no'
140 -
141 -# Use ssl encryption with mysqldump?
142 -#CONFIG_mysql_dump_usessl='yes'
143 -
144 -# For connections to localhost. Sometimes the Unix socket file must be specified.
145 -#CONFIG_mysql_dump_socket=''
146 -
147 -# The maximum size of the buffer for client/server communication. e.g. 16MB (maximum is 1GB)
148 -#CONFIG_mysql_dump_max_allowed_packet=''
149 -
150 -# This option sends a START TRANSACTION SQL statement to the server before dumping data. It is useful only with
151 -# transactional tables such as InnoDB, because then it dumps the consistent state of the database at the time
152 -# when BEGIN was issued without blocking any applications.
153 -#
154 -# When using this option, you should keep in mind that only InnoDB tables are dumped in a consistent state. For
155 -# example, any MyISAM or MEMORY tables dumped while using this option may still change state.
156 -#
157 -# While a --single-transaction dump is in process, to ensure a valid dump file (correct table contents and
158 -# binary log coordinates), no other connection should use the following statements: ALTER TABLE, CREATE TABLE,
159 -# DROP TABLE, RENAME TABLE, TRUNCATE TABLE. A consistent read is not isolated from those statements, so use of
160 -# them on a table to be dumped can cause the SELECT that is performed by mysqldump to retrieve the table
161 -# contents to obtain incorrect contents or fail.
162 -#CONFIG_mysql_dump_single_transaction='no'
163 -
164 -# http://dev.mysql.com/doc/refman/5.0/en/mysqldump.html#option_mysqldump_master-data
165 -# --master-data[=value]
166 -# Use this option to dump a master replication server to produce a dump file that can be used to set up another
167 -# server as a slave of the master. It causes the dump output to include a CHANGE MASTER TO statement that indicates
168 -# the binary log coordinates (file name and position) of the dumped server. These are the master server coordinates
169 -# from which the slave should start replicating after you load the dump file into the slave.
170 -#
171 -# If the option value is 2, the CHANGE MASTER TO statement is written as an SQL comment, and thus is informative only;
172 -# it has no effect when the dump file is reloaded. If the option value is 1, the statement is not written as a comment
173 -# and takes effect when the dump file is reloaded. If no option value is specified, the default value is 1.
174 -#
175 -# This option requires the RELOAD privilege and the binary log must be enabled.
176 -#
177 -# The --master-data option automatically turns off --lock-tables. It also turns on --lock-all-tables, unless
178 -# --single-transaction also is specified, in which case, a global read lock is acquired only for a short time at the
179 -# beginning of the dump (see the description for --single-transaction). In all cases, any action on logs happens at
180 -# the exact moment of the dump.
181 -# ==================================================================================================================
182 -# possible values are 1 and 2, which correspond with the values from mysqldump
183 -# VARIABLE= , i.e. no value, turns it off (default)
184 -#
185 -#CONFIG_mysql_dump_master_data=
186 -
187 -# Included stored routines (procedures and functions) for the dumped databases in the output. Use of this option
188 -# requires the SELECT privilege for the mysql.proc table. The output generated by using --routines contains
189 -# CREATE PROCEDURE and CREATE FUNCTION statements to re-create the routines. However, these statements do not
190 -# include attributes such as the routine creation and modification timestamps. This means that when the routines
191 -# are reloaded, they will be created with the timestamps equal to the reload time.
192 -#
193 -# If you require routines to be re-created with their original timestamp attributes, do not use --routines. Instead,
194 -# dump and reload the contents of the mysql.proc table directly, using a MySQL account that has appropriate privileges
195 -# for the mysql database.
196 -#
197 -# This option was added in MySQL 5.0.13. Before that, stored routines are not dumped. Routine DEFINER values are not
198 -# dumped until MySQL 5.0.20. This means that before 5.0.20, when routines are reloaded, they will be created with the
199 -# definer set to the reloading user. If you require routines to be re-created with their original definer, dump and
200 -# load the contents of the mysql.proc table directly as described earlier.
201 -#
202 -#CONFIG_mysql_dump_full_schema='yes'
203 -
204 -# Backup status of table(s) in textfile. This is very helpful when restoring backups, since it gives an idea, what changed
205 -# in the meantime.
206 -#CONFIG_mysql_dump_dbstatus='yes'
207 -
208 -# Backup dump settings
209 -
210 -# Include CREATE DATABASE in backup?
211 -#CONFIG_mysql_dump_create_database='no'
212 -
213 -# Separate backup directory and file for each DB? (yes or no)
214 -#CONFIG_mysql_dump_use_separate_dirs='yes'
215 -
216 -# Choose Compression type. (gzip or bzip2)
217 -#CONFIG_mysql_dump_compression='gzip'
218 -
219 -# Store an additional copy of the latest backup to a standard
220 -# location so it can be downloaded by third party scripts.
221 -#CONFIG_mysql_dump_latest='no'
222 -
223 -# Remove all date and time information from the filenames in the latest folder.
224 -# Runs, if activated, once after the backups are completed. Practically it just finds all files in the latest folder
225 -# and removes the date and time information from the filenames (if present).
226 -#CONFIG_mysql_dump_latest_clean_filenames='no'
227 -
228 -# Create differential backups. Master backups are created weekly at #$CONFIG_do_weekly weekday. Between master backups,
229 -# diff is used to create differential backups relative to the latest master backup. In the Manifest file, you find the
230 -# following structure
231 -# $filename md5sum $md5sum diff_id $diff_id rel_id $rel_id
232 -# where each field is separated by the tabular character '\t'. The entries with $ at the beginning mean the actual values,
233 -# while the others are just for readability. The diff_id is the id of the differential or master backup which is also in
234 -# the filename after the last _ and before the suffixes begin, i.e. .diff, .sql and extensions. It is used to relate
235 -# differential backups to master backups. The master backups have 0 as $rel_id and are thereby identifiable. Differential
236 -# backups have the id of the corresponding master backup as $rel_id.
237 -#
238 -# To ensure that master backups are kept long enough, the value of $CONFIG_rotation_daily is set to a minimum of 21 days.
239 -#
240 -#CONFIG_mysql_dump_differential='no'
241 -
242 -
243 -# Notification setup
244 -
245 -# What would you like to be mailed to you?
246 -# - log : send only log file
247 -# - files : send log file and sql files as attachments (see docs)
248 -# - stdout : will simply output the log to the screen if run manually.
249 -# - quiet : Only send logs if an error occurs to the MAILADDR.
250 -CONFIG_mailcontent=$MAILCONTENT
251 -
252 -# Set the maximum allowed email size in k. (4000 = approx 5MB email [see docs])
253 -CONFIG_mail_maxattsize=$SIZEMAIL
254 -
255 -# Allow packing of files with tar and splitting it in pieces of CONFIG_mail_maxattsize.
256 -CONFIG_mail_splitandtar='yes'
257 -
258 -# Use uuencode instead of mutt. WARNING: Not all email clients work well with uuencoded attachments.
259 -#CONFIG_mail_use_uuencoded_attachments='no'
260 -
261 -# Email Address to send mail to? (user@domain.com)
262 -CONFIG_mail_address=$MAILTO
263 -
264 -
265 -# Encryption
266 -
267 -# Do you wish to encrypt your backups using openssl?
268 -CONFIG_encrypt=$ENCRYPT
269 -
270 -# Choose a password to encrypt the backups.
271 -CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
272 -
273 -# Other
274 -
275 -# Backup local files, i.e. maybe you would like to backup your my.cnf (mysql server configuration), etc.
276 -# These files will be tar'ed, depending on your compression option CONFIG_mysql_dump_compression compressed and
277 -# depending on the option CONFIG_encrypt encrypted.
278 -#
279 -# Note: This could also have been accomplished with CONFIG_prebackup or CONFIG_postbackup.
280 -CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
281 -
282 -# Command to run before backups (uncomment to use)
283 -#CONFIG_prebackup="/etc/mysql-backup-pre"
284 -
285 -# Command run after backups (uncomment to use)
286 -#CONFIG_postbackup="/etc/mysql-backup-post"
287 -
288 -# Uncomment to activate! This will give folders rwx------
289 -# and files rw------- permissions.
290 -umask 0077
291 -
292 -# dry-run, i.e. show what you are gonna do without actually doing it
293 -# inactive: =0 or commented out
294 -# active: uncommented AND =1
295 -#CONFIG_dryrun=1
296 -
297 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mymaria smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mymaria
298 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mymaria 1970-01-01 01:00:00.000000000 +0100
299 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mymaria 2018-07-09 14:13:37.532047394 +0200
300 @@ -0,0 +1 @@
301 +disabled
302 \ No newline at end of file
303 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql53 smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql53
304 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql53 1970-01-01 01:00:00.000000000 +0100
305 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql53 2018-07-09 14:13:37.532047394 +0200
306 @@ -0,0 +1 @@
307 +enabled
308 \ No newline at end of file
309 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql55 smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql55
310 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql55 1970-01-01 01:00:00.000000000 +0100
311 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql55 2018-07-09 14:13:37.533047443 +0200
312 @@ -0,0 +1 @@
313 +disabled
314 \ No newline at end of file
315 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql57 smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql57
316 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql57 1970-01-01 01:00:00.000000000 +0100
317 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql57 2018-07-09 14:13:37.533047443 +0200
318 @@ -0,0 +1 @@
319 +disabled
320 \ No newline at end of file
321 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start
322 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start 1970-01-01 01:00:00.000000000 +0100
323 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start 2018-07-09 14:13:37.542047887 +0200
324 @@ -0,0 +1,18 @@
325 +{
326 +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled';
327 +my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled';
328 +if ($mymaria eq 'enabled' && $myauto eq 'enabled') {
329 +$OUT .= <<'_EOF';
330 +#version=3.0_rc2
331 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
332 +CONFIG_mysql_dump_username='backupuser'
333 +CONFIG_mysql_dump_password=$PWDMYSQL
334 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
335 +_EOF
336 +}
337 +else {
338 +$OUT .= "#version=3.0_rc2\n";
339 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
340 +$OUT .= "# Automysqlbackup disabled\n";
341 +}
342 +}
343 \ No newline at end of file
344 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db
345 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db 1970-01-01 01:00:00.000000000 +0100
346 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db 2018-07-09 14:13:37.543047937 +0200
347 @@ -0,0 +1,14 @@
348 +{
349 +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled';
350 +my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled';
351 +if ($mymaria eq 'enabled' && $myauto eq 'enabled') {
352 +$OUT .= <<'_EOF';
353 +# DB Specific
354 +CONFIG_backup_dir=${BACKUPDIR}_mymaria
355 +CONFIG_mysql_dump_full_schema='no'
356 +CONFIG_db_exclude=( 'performance_schema' 'sys' )
357 +CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb55.sock'
358 +# End
359 +_EOF
360 +}
361 +}
362 \ No newline at end of file
363 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/30end
364 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/30end 1970-01-01 01:00:00.000000000 +0100
365 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/30end 2018-07-09 14:13:37.556048573 +0200
366 @@ -0,0 +1,16 @@
367 +{
368 +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled';
369 +my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled';
370 +if ($mymaria eq 'enabled' && $myauto eq 'enabled') {
371 +$OUT .= <<'_EOF';
372 +CONFIG_mailcontent=$MAILCONTENT
373 +CONFIG_mail_maxattsize=$SIZEMAIL
374 +CONFIG_mail_splitandtar='yes'
375 +CONFIG_mail_address=$MAILTO
376 +CONFIG_encrypt=$ENCRYPT
377 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
378 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
379 +umask 0077
380 +_EOF
381 +}
382 +}
383 \ No newline at end of file
384 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
385 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start 1970-01-01 01:00:00.000000000 +0100
386 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start 2018-07-09 14:13:37.556048573 +0200
387 @@ -0,0 +1,19 @@
388 +{
389 +my $my53 = ${'mysqld'}{'status'} || 'disabled';
390 +my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled';
391 +if ($my53 eq 'enabled' && $myauto eq 'enabled') {
392 +$OUT .= <<'_EOF';
393 +#version=3.0_rc2
394 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
395 +CONFIG_mysql_dump_username='backupuser'
396 +CONFIG_mysql_dump_password=$PWDMYSQL
397 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
398 +CONFIG_backup_dir=$BACKUPDIR
399 +_EOF
400 +}
401 +else {
402 +$OUT .= "#version=3.0_rc2\n";
403 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
404 +$OUT .= "# Automysqlbackup disabled\n";
405 +}
406 +}
407 \ No newline at end of file
408 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
409 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db 1970-01-01 01:00:00.000000000 +0100
410 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db 2018-07-09 14:13:37.558048680 +0200
411 @@ -0,0 +1,7 @@
412 +{
413 +my $my53 = ${'mysqld'}{'status'} || 'disabled';
414 +my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled';
415 +if ($my53 eq 'enabled' && $myauto eq 'enabled') {
416 +$OUT .= "CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock'\n";
417 +}
418 +}
419 \ No newline at end of file
420 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
421 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end 1970-01-01 01:00:00.000000000 +0100
422 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end 2018-07-09 14:13:37.558048680 +0200
423 @@ -0,0 +1,16 @@
424 +{
425 +my $my53 = ${'mysqld'}{'status'} || 'disabled';
426 +my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled';
427 +if ($my53 eq 'enabled' && $myauto eq 'enabled') {
428 +$OUT .= <<'_EOF';
429 +CONFIG_mailcontent=$MAILCONTENT
430 +CONFIG_mail_maxattsize=$SIZEMAIL
431 +CONFIG_mail_splitandtar='yes'
432 +CONFIG_mail_address=$MAILTO
433 +CONFIG_encrypt=$ENCRYPT
434 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
435 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
436 +umask 0077
437 +_EOF
438 +}
439 +}
440 \ No newline at end of file
441 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
442 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start 1970-01-01 01:00:00.000000000 +0100
443 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start 2018-07-09 14:13:37.559048732 +0200
444 @@ -0,0 +1,18 @@
445 +{
446 +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled';
447 +my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled';
448 +if ($my55 eq 'enabled' && $myauto eq 'enabled') {
449 +$OUT .= <<'_EOF';
450 +#version=3.0_rc2
451 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
452 +CONFIG_mysql_dump_username='backupuser'
453 +CONFIG_mysql_dump_password=$PWDMYSQL
454 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
455 +_EOF
456 +}
457 +else {
458 +$OUT .= "#version=3.0_rc2\n";
459 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
460 +$OUT .= "# Automysqlbackup disabled\n";
461 +}
462 +}
463 \ No newline at end of file
464 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
465 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db 1970-01-01 01:00:00.000000000 +0100
466 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db 2018-07-09 14:13:37.559048732 +0200
467 @@ -0,0 +1,14 @@
468 +{
469 +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled';
470 +my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled';
471 +if ($my55 eq 'enabled' && $myauto eq 'enabled') {
472 +$OUT .= <<'_EOF';
473 +# DB Specific
474 +CONFIG_backup_dir=${BACKUPDIR}_mysql55
475 +CONFIG_mysql_dump_full_schema='no'
476 +CONFIG_db_exclude=( 'information_schema' 'performance_schema' 'sys' )
477 +CONFIG_mysql_dump_socket='/var/lib/mysql/mysql55.sock'
478 +# End
479 +_EOF
480 +}
481 +}
482 \ No newline at end of file
483 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
484 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end 1970-01-01 01:00:00.000000000 +0100
485 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end 2018-07-09 14:13:37.560048781 +0200
486 @@ -0,0 +1,16 @@
487 +{
488 +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled';
489 +my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled';
490 +if ($my55 eq 'enabled' && $myauto eq 'enabled') {
491 +$OUT .= <<'_EOF';
492 +CONFIG_mailcontent=$MAILCONTENT
493 +CONFIG_mail_maxattsize=$SIZEMAIL
494 +CONFIG_mail_splitandtar='yes'
495 +CONFIG_mail_address=$MAILTO
496 +CONFIG_encrypt=$ENCRYPT
497 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
498 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
499 +umask 0077
500 +_EOF
501 +}
502 +}
503 \ No newline at end of file
504 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/10start smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/10start
505 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/10start 1970-01-01 01:00:00.000000000 +0100
506 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/10start 2018-07-09 14:13:37.561048828 +0200
507 @@ -0,0 +1,18 @@
508 +{
509 +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled';
510 +my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled';
511 +if ($my57 eq 'enabled' && $myauto eq 'enabled') {
512 +$OUT .= <<'_EOF';
513 +#version=3.0_rc2
514 +# DONT'T REMOVE THE PREVIOUS VERSION LINE!
515 +CONFIG_mysql_dump_username='backupuser'
516 +CONFIG_mysql_dump_password=$PWDMYSQL
517 +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME
518 +_EOF
519 +}
520 +else {
521 +$OUT .= "#version=3.0_rc2\n";
522 +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n";
523 +$OUT .= "# Automysqlbackup disabled\n";
524 +}
525 +}
526 \ No newline at end of file
527 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db
528 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db 1970-01-01 01:00:00.000000000 +0100
529 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db 2018-07-09 14:13:37.561048828 +0200
530 @@ -0,0 +1,14 @@
531 +{
532 +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled';
533 +my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled';
534 +if ($my57 eq 'enabled' && $myauto eq 'enabled') {
535 +$OUT .= <<'_EOF';
536 +# DB Specific
537 +CONFIG_backup_dir=${BACKUPDIR}_mysql57
538 +CONFIG_mysql_dump_full_schema='no'
539 +CONFIG_db_exclude=( 'performance_schema' 'sys' )
540 +CONFIG_mysql_dump_socket='/var/lib/mysql/mysql57.sock'
541 +# End
542 +_EOF
543 +}
544 +}
545 \ No newline at end of file
546 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/30end smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/30end
547 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/30end 1970-01-01 01:00:00.000000000 +0100
548 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/30end 2018-07-09 14:13:37.573049415 +0200
549 @@ -0,0 +1,16 @@
550 +{
551 +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled';
552 +my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled';
553 +if ($my57 eq 'enabled' && $myauto eq 'enabled') {
554 +$OUT .= <<'_EOF';
555 +CONFIG_mailcontent=$MAILCONTENT
556 +CONFIG_mail_maxattsize=$SIZEMAIL
557 +CONFIG_mail_splitandtar='yes'
558 +CONFIG_mail_address=$MAILTO
559 +CONFIG_encrypt=$ENCRYPT
560 +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD
561 +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES)
562 +umask 0077
563 +_EOF
564 +}
565 +}
566 \ No newline at end of file
567 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base
568 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2018-07-06 11:54:05.456758697 +0200
569 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2018-07-09 14:13:37.582049862 +0200
570 @@ -1 +1,9 @@
571 -{${'automysqlbackup'}{'Minute'}||'1'} {${'automysqlbackup'}{'Hour'}||'3'} * * * root /sbin/e-smith/runmysqlbackup
572 +{
573 +my $my53 = ${'mysqld'}{'status'} || 'disabled';
574 +
575 +return '' unless $my53 eq 'enabled';
576 +my $minutes= ${'automysqlbackup'}{'Minute'}||'1';
577 +my $hours= ${'automysqlbackup'}{'Hour'}||'3';
578 +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/myserver.conf > /dev/null\n";
579 +
580 +}
581 \ No newline at end of file
582 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/20mysql55 smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/20mysql55
583 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/20mysql55 1970-01-01 01:00:00.000000000 +0100
584 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/20mysql55 2018-07-09 14:13:37.583049912 +0200
585 @@ -0,0 +1,9 @@
586 +{
587 +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled';
588 +
589 +return '' unless $my55 eq 'enabled';
590 +my $minutes= ${'automysqlbackup'}{'Minute'}||'1';
591 +my $hours= ${'automysqlbackup'}{'Hour'}||'3';
592 +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mysql55.conf > /dev/null\n";
593 +
594 +}
595 \ No newline at end of file
596 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/21mysql57 smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/21mysql57
597 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/21mysql57 1970-01-01 01:00:00.000000000 +0100
598 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/21mysql57 2018-07-09 14:13:37.583049912 +0200
599 @@ -0,0 +1,9 @@
600 +{
601 +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled';
602 +
603 +return '' unless $my57 eq 'enabled';
604 +my $minutes= ${'automysqlbackup'}{'Minute'}||'1';
605 +my $hours= ${'automysqlbackup'}{'Hour'}||'3';
606 +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mysql57.conf > /dev/null\n";
607 +
608 +}
609 \ No newline at end of file
610 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/22mymaria smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/22mymaria
611 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/22mymaria 1970-01-01 01:00:00.000000000 +0100
612 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/22mymaria 2018-07-09 14:13:37.584049962 +0200
613 @@ -0,0 +1,9 @@
614 +{
615 +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled';
616 +
617 +return '' unless $mymaria eq 'enabled';
618 +my $minutes= ${'automysqlbackup'}{'Minute'}||'1';
619 +my $hours= ${'automysqlbackup'}{'Hour'}||'3';
620 +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mymaria.conf > /dev/null\n";
621 +
622 +}
623 \ No newline at end of file
624 diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/sbin/e-smith/runmysqlbackup smeserver-automysqlbackup-3.0.RC6/root/sbin/e-smith/runmysqlbackup
625 --- smeserver-automysqlbackup-3.0.RC6.old/root/sbin/e-smith/runmysqlbackup 2018-07-06 11:54:05.456758697 +0200
626 +++ smeserver-automysqlbackup-3.0.RC6/root/sbin/e-smith/runmysqlbackup 2018-07-09 14:13:37.584049962 +0200
627 @@ -1,6 +1,6 @@
628 #!/bin/sh
629
630 -/usr/local/bin/automysqlbackup /etc/automysqlbackup/myserver.conf >/dev/null
631 +/usr/local/bin/automysqlbackup >/dev/null
632
633 chown root:root /root/backup/db* -R
634 find /root/backup/db* -type f -exec chmod 400 {} \;

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed