diff -ruN smeserver-automysqlbackup-3.0.RC6.old/createlinks smeserver-automysqlbackup-3.0.RC6/createlinks --- smeserver-automysqlbackup-3.0.RC6.old/createlinks 2018-07-06 11:54:05.456758697 +0200 +++ smeserver-automysqlbackup-3.0.RC6/createlinks 2018-07-09 14:13:37.532047394 +0200 @@ -6,11 +6,21 @@ # links to add # templates to expand -for my $event (qw( -bootstrap-console-save -console-save -automysqlbackup-update -)) + +foreach (qw( + /etc/cron.d/runmysqlbackup + /etc/automysqlbackup/myserver.conf + /etc/automysqlbackup/mysql55.conf + /etc/automysqlbackup/mysql57.conf + /etc/automysqlbackup/mymaria.conf + + )) { - templates2events( "/etc/cron.d/runmysqlbackup" , $event ); + templates2events( + "$_", qw( + automysqlbackup-update + console-save + bootstrap-console-save + ) + ); } diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/automysqlbackup/myserver.conf smeserver-automysqlbackup-3.0.RC6/root/etc/automysqlbackup/myserver.conf --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/automysqlbackup/myserver.conf 2018-07-06 11:54:05.432757518 +0200 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/automysqlbackup/myserver.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,261 +0,0 @@ -#version=3.0_rc2 -# DONT'T REMOVE THE PREVIOUS VERSION LINE! -# -# Uncomment to change the default values (shown after =) -# WARNING: -# This is not true for UMASK, CONFIG_prebackup and CONFIG_postbackup!!! -# -# Default values are stored in the script itself. Declarations in -# /etc/automysqlbackup/automysqlbackup.conf will overwrite them. The -# declarations in here will supersede all other. - -# Edit $PATH if mysql and mysqldump are not located in /usr/local/bin:/usr/bin:/bin:/usr/local/mysql/bin -#PATH=${PATH}:FULL_PATH_TO_YOUR_DIR_CONTAINING_MYSQL:FULL_PATH_TO_YOUR_DIR_CONTAINING_MYSQLDUMP - -# Basic Settings - -# Username to access the MySQL server e.g. dbuser -CONFIG_mysql_dump_username='backupuser' - -# Password to access the MySQL server e.g. password -CONFIG_mysql_dump_password=$PWDMYSQL - -# Host name (or IP address) of MySQL server e.g localhost -#CONFIG_mysql_dump_host='localhost' - -# "Friendly" host name of MySQL server to be used in email log -# if unset or empty (default) will use CONFIG_mysql_dump_host instead -CONFIG_mysql_dump_host_friendly=$SYSTEMNAME - -# Backup directory location e.g /backups -CONFIG_backup_dir=$BACKUPDIR - -# This is practically a moot point, since there is a fallback to the compression -# functions without multicore support in the case that the multicore versions aren't -# present in the system. Of course, if you have the latter installed, but don't want -# to use them, just choose no here. -# pigz -> gzip -# pbzip2 -> bzip2 -#CONFIG_multicore='yes' - -# Number of threads (= occupied cores) you want to use. You should - for the sake -# of the stability of your system - not choose more than (#number of cores - 1). -# Especially if the script is run in background by cron and the rest of your system -# has already heavy load, setting this too high, might crash your system. Assuming -# all systems have at least some sort of HyperThreading, the default is 2 threads. -# If you wish to let pigz and pbzip2 autodetect or use their standards, set it to -# 'auto'. -#CONFIG_multicore_threads=2 - -# Databases to backup - -# List of databases for Daily/Weekly Backup e.g. ( 'DB1' 'DB2' 'DB3' ... ) -# set to (), i.e. empty, if you want to backup all databases -#CONFIG_db_names=() -# You can use -#declare -a MDBNAMES=( "${DBNAMES[@]}" 'added entry1' 'added entry2' ... ) -# INSTEAD to copy the contents of $DBNAMES and add further entries (optional). - -# List of databases for Monthly Backups. -# set to (), i.e. empty, if you want to backup all databases -#CONFIG_db_month_names=() - -# List of DBNAMES to EXLUCDE if DBNAMES is empty, i.e. (). -#CONFIG_db_exclude=( 'information_schema' ) - -# List of tables to exclude, in the form db_name.table_name -# You may use wildcards for the table names, i.e. 'mydb.a*' selects all tables starting with an 'a'. -# However we only offer the wildcard '*', matching everything that could appear, which translates to the -# '%' wildcard in mysql. -#CONFIG_table_exclude=() - - -# Advanced Settings - -# Rotation Settings - -# Which day do you want monthly backups? (01 to 31) -# If the chosen day is greater than the last day of the month, it will be done -# on the last day of the month. -# Set to 0 to disable monthly backups. -#CONFIG_do_monthly="01" - -# Which day do you want weekly backups? (1 to 7 where 1 is Monday) -# Set to 0 to disable weekly backups. -#CONFIG_do_weekly="5" - -# Set rotation of daily backups. VALUE*24hours -# If you want to keep only today's backups, you could choose 1, i.e. everything older than 24hours will be removed. -#CONFIG_rotation_daily=6 - -# Set rotation for weekly backups. VALUE*24hours -#CONFIG_rotation_weekly=35 - -# Set rotation for monthly backups. VALUE*24hours -#CONFIG_rotation_monthly=150 - - -# Server Connection Settings - -# Set the port for the mysql connection -#CONFIG_mysql_dump_port=3306 - -# Compress communications between backup server and MySQL server? -#CONFIG_mysql_dump_commcomp='no' - -# Use ssl encryption with mysqldump? -#CONFIG_mysql_dump_usessl='yes' - -# For connections to localhost. Sometimes the Unix socket file must be specified. -#CONFIG_mysql_dump_socket='' - -# The maximum size of the buffer for client/server communication. e.g. 16MB (maximum is 1GB) -#CONFIG_mysql_dump_max_allowed_packet='' - -# This option sends a START TRANSACTION SQL statement to the server before dumping data. It is useful only with -# transactional tables such as InnoDB, because then it dumps the consistent state of the database at the time -# when BEGIN was issued without blocking any applications. -# -# When using this option, you should keep in mind that only InnoDB tables are dumped in a consistent state. For -# example, any MyISAM or MEMORY tables dumped while using this option may still change state. -# -# While a --single-transaction dump is in process, to ensure a valid dump file (correct table contents and -# binary log coordinates), no other connection should use the following statements: ALTER TABLE, CREATE TABLE, -# DROP TABLE, RENAME TABLE, TRUNCATE TABLE. A consistent read is not isolated from those statements, so use of -# them on a table to be dumped can cause the SELECT that is performed by mysqldump to retrieve the table -# contents to obtain incorrect contents or fail. -#CONFIG_mysql_dump_single_transaction='no' - -# http://dev.mysql.com/doc/refman/5.0/en/mysqldump.html#option_mysqldump_master-data -# --master-data[=value] -# Use this option to dump a master replication server to produce a dump file that can be used to set up another -# server as a slave of the master. It causes the dump output to include a CHANGE MASTER TO statement that indicates -# the binary log coordinates (file name and position) of the dumped server. These are the master server coordinates -# from which the slave should start replicating after you load the dump file into the slave. -# -# If the option value is 2, the CHANGE MASTER TO statement is written as an SQL comment, and thus is informative only; -# it has no effect when the dump file is reloaded. If the option value is 1, the statement is not written as a comment -# and takes effect when the dump file is reloaded. If no option value is specified, the default value is 1. -# -# This option requires the RELOAD privilege and the binary log must be enabled. -# -# The --master-data option automatically turns off --lock-tables. It also turns on --lock-all-tables, unless -# --single-transaction also is specified, in which case, a global read lock is acquired only for a short time at the -# beginning of the dump (see the description for --single-transaction). In all cases, any action on logs happens at -# the exact moment of the dump. -# ================================================================================================================== -# possible values are 1 and 2, which correspond with the values from mysqldump -# VARIABLE= , i.e. no value, turns it off (default) -# -#CONFIG_mysql_dump_master_data= - -# Included stored routines (procedures and functions) for the dumped databases in the output. Use of this option -# requires the SELECT privilege for the mysql.proc table. The output generated by using --routines contains -# CREATE PROCEDURE and CREATE FUNCTION statements to re-create the routines. However, these statements do not -# include attributes such as the routine creation and modification timestamps. This means that when the routines -# are reloaded, they will be created with the timestamps equal to the reload time. -# -# If you require routines to be re-created with their original timestamp attributes, do not use --routines. Instead, -# dump and reload the contents of the mysql.proc table directly, using a MySQL account that has appropriate privileges -# for the mysql database. -# -# This option was added in MySQL 5.0.13. Before that, stored routines are not dumped. Routine DEFINER values are not -# dumped until MySQL 5.0.20. This means that before 5.0.20, when routines are reloaded, they will be created with the -# definer set to the reloading user. If you require routines to be re-created with their original definer, dump and -# load the contents of the mysql.proc table directly as described earlier. -# -#CONFIG_mysql_dump_full_schema='yes' - -# Backup status of table(s) in textfile. This is very helpful when restoring backups, since it gives an idea, what changed -# in the meantime. -#CONFIG_mysql_dump_dbstatus='yes' - -# Backup dump settings - -# Include CREATE DATABASE in backup? -#CONFIG_mysql_dump_create_database='no' - -# Separate backup directory and file for each DB? (yes or no) -#CONFIG_mysql_dump_use_separate_dirs='yes' - -# Choose Compression type. (gzip or bzip2) -#CONFIG_mysql_dump_compression='gzip' - -# Store an additional copy of the latest backup to a standard -# location so it can be downloaded by third party scripts. -#CONFIG_mysql_dump_latest='no' - -# Remove all date and time information from the filenames in the latest folder. -# Runs, if activated, once after the backups are completed. Practically it just finds all files in the latest folder -# and removes the date and time information from the filenames (if present). -#CONFIG_mysql_dump_latest_clean_filenames='no' - -# Create differential backups. Master backups are created weekly at #$CONFIG_do_weekly weekday. Between master backups, -# diff is used to create differential backups relative to the latest master backup. In the Manifest file, you find the -# following structure -# $filename md5sum $md5sum diff_id $diff_id rel_id $rel_id -# where each field is separated by the tabular character '\t'. The entries with $ at the beginning mean the actual values, -# while the others are just for readability. The diff_id is the id of the differential or master backup which is also in -# the filename after the last _ and before the suffixes begin, i.e. .diff, .sql and extensions. It is used to relate -# differential backups to master backups. The master backups have 0 as $rel_id and are thereby identifiable. Differential -# backups have the id of the corresponding master backup as $rel_id. -# -# To ensure that master backups are kept long enough, the value of $CONFIG_rotation_daily is set to a minimum of 21 days. -# -#CONFIG_mysql_dump_differential='no' - - -# Notification setup - -# What would you like to be mailed to you? -# - log : send only log file -# - files : send log file and sql files as attachments (see docs) -# - stdout : will simply output the log to the screen if run manually. -# - quiet : Only send logs if an error occurs to the MAILADDR. -CONFIG_mailcontent=$MAILCONTENT - -# Set the maximum allowed email size in k. (4000 = approx 5MB email [see docs]) -CONFIG_mail_maxattsize=$SIZEMAIL - -# Allow packing of files with tar and splitting it in pieces of CONFIG_mail_maxattsize. -CONFIG_mail_splitandtar='yes' - -# Use uuencode instead of mutt. WARNING: Not all email clients work well with uuencoded attachments. -#CONFIG_mail_use_uuencoded_attachments='no' - -# Email Address to send mail to? (user@domain.com) -CONFIG_mail_address=$MAILTO - - -# Encryption - -# Do you wish to encrypt your backups using openssl? -CONFIG_encrypt=$ENCRYPT - -# Choose a password to encrypt the backups. -CONFIG_encrypt_password=$DBENCRYPT_PASSWORD - -# Other - -# Backup local files, i.e. maybe you would like to backup your my.cnf (mysql server configuration), etc. -# These files will be tar'ed, depending on your compression option CONFIG_mysql_dump_compression compressed and -# depending on the option CONFIG_encrypt encrypted. -# -# Note: This could also have been accomplished with CONFIG_prebackup or CONFIG_postbackup. -CONFIG_backup_local_files=($BACKUP_LOCAL_FILES) - -# Command to run before backups (uncomment to use) -#CONFIG_prebackup="/etc/mysql-backup-pre" - -# Command run after backups (uncomment to use) -#CONFIG_postbackup="/etc/mysql-backup-post" - -# Uncomment to activate! This will give folders rwx------ -# and files rw------- permissions. -umask 0077 - -# dry-run, i.e. show what you are gonna do without actually doing it -# inactive: =0 or commented out -# active: uncommented AND =1 -#CONFIG_dryrun=1 - 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mymaria 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mymaria 2018-07-09 14:13:37.532047394 +0200 @@ -0,0 +1 @@ +disabled \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql53 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql53 2018-07-09 14:13:37.532047394 +0200 @@ -0,0 +1 @@ +enabled \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql55 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql55 2018-07-09 14:13:37.533047443 +0200 @@ -0,0 +1 @@ +disabled \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql57 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql57 2018-07-09 14:13:37.533047443 +0200 @@ -0,0 +1 @@ +disabled \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start 2018-07-09 14:13:37.542047887 +0200 @@ -0,0 +1,18 @@ +{ +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled'; +if ($mymaria eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +#version=3.0_rc2 +# DONT'T REMOVE THE PREVIOUS VERSION LINE! +CONFIG_mysql_dump_username='backupuser' +CONFIG_mysql_dump_password=$PWDMYSQL +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME +_EOF +} +else { +$OUT .= "#version=3.0_rc2\n"; +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; +$OUT .= "# Automysqlbackup disabled\n"; +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db 2018-07-09 14:13:37.543047937 +0200 @@ -0,0 +1,14 @@ +{ +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled'; +if ($mymaria eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +# DB Specific +CONFIG_backup_dir=${BACKUPDIR}_mymaria +CONFIG_mysql_dump_full_schema='no' +CONFIG_db_exclude=( 'performance_schema' 'sys' ) +CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb55.sock' +# End +_EOF +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/30end 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/30end 2018-07-09 14:13:37.556048573 +0200 @@ -0,0 +1,16 @@ +{ +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled'; +if ($mymaria eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +CONFIG_mailcontent=$MAILCONTENT +CONFIG_mail_maxattsize=$SIZEMAIL +CONFIG_mail_splitandtar='yes' +CONFIG_mail_address=$MAILTO +CONFIG_encrypt=$ENCRYPT +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES) +umask 0077 +_EOF +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start 2018-07-09 14:13:37.556048573 +0200 @@ -0,0 +1,19 @@ +{ +my $my53 = ${'mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled'; +if ($my53 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +#version=3.0_rc2 +# DONT'T REMOVE THE PREVIOUS VERSION LINE! +CONFIG_mysql_dump_username='backupuser' +CONFIG_mysql_dump_password=$PWDMYSQL +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME +CONFIG_backup_dir=$BACKUPDIR +_EOF +} +else { +$OUT .= "#version=3.0_rc2\n"; +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; +$OUT .= "# Automysqlbackup disabled\n"; +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db 2018-07-09 14:13:37.558048680 +0200 @@ -0,0 +1,7 @@ +{ +my $my53 = ${'mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled'; +if ($my53 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= "CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock'\n"; +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end 2018-07-09 14:13:37.558048680 +0200 @@ -0,0 +1,16 @@ +{ +my $my53 = ${'mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled'; +if ($my53 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +CONFIG_mailcontent=$MAILCONTENT +CONFIG_mail_maxattsize=$SIZEMAIL +CONFIG_mail_splitandtar='yes' +CONFIG_mail_address=$MAILTO +CONFIG_encrypt=$ENCRYPT +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES) +umask 0077 +_EOF +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start 2018-07-09 14:13:37.559048732 +0200 @@ -0,0 +1,18 @@ +{ +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled'; +if ($my55 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +#version=3.0_rc2 +# DONT'T REMOVE THE PREVIOUS VERSION LINE! +CONFIG_mysql_dump_username='backupuser' +CONFIG_mysql_dump_password=$PWDMYSQL +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME +_EOF +} +else { +$OUT .= "#version=3.0_rc2\n"; +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; +$OUT .= "# Automysqlbackup disabled\n"; +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db 2018-07-09 14:13:37.559048732 +0200 @@ -0,0 +1,14 @@ +{ +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled'; +if ($my55 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +# DB Specific +CONFIG_backup_dir=${BACKUPDIR}_mysql55 +CONFIG_mysql_dump_full_schema='no' +CONFIG_db_exclude=( 'information_schema' 'performance_schema' 'sys' ) +CONFIG_mysql_dump_socket='/var/lib/mysql/mysql55.sock' +# End +_EOF +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end 2018-07-09 14:13:37.560048781 +0200 @@ -0,0 +1,16 @@ +{ +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled'; +if ($my55 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +CONFIG_mailcontent=$MAILCONTENT +CONFIG_mail_maxattsize=$SIZEMAIL +CONFIG_mail_splitandtar='yes' +CONFIG_mail_address=$MAILTO +CONFIG_encrypt=$ENCRYPT +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES) +umask 0077 +_EOF +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/10start 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/10start 2018-07-09 14:13:37.561048828 +0200 @@ -0,0 +1,18 @@ +{ +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled'; +if ($my57 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +#version=3.0_rc2 +# DONT'T REMOVE THE PREVIOUS VERSION LINE! +CONFIG_mysql_dump_username='backupuser' +CONFIG_mysql_dump_password=$PWDMYSQL +CONFIG_mysql_dump_host_friendly=$SYSTEMNAME +_EOF +} +else { +$OUT .= "#version=3.0_rc2\n"; +$OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; +$OUT .= "# Automysqlbackup disabled\n"; +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db 2018-07-09 14:13:37.561048828 +0200 @@ -0,0 +1,14 @@ +{ +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled'; +if ($my57 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +# DB Specific +CONFIG_backup_dir=${BACKUPDIR}_mysql57 +CONFIG_mysql_dump_full_schema='no' +CONFIG_db_exclude=( 'performance_schema' 'sys' ) +CONFIG_mysql_dump_socket='/var/lib/mysql/mysql57.sock' +# End +_EOF +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/30end 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/30end 2018-07-09 14:13:37.573049415 +0200 @@ -0,0 +1,16 @@ +{ +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled'; +if ($my57 eq 'enabled' && $myauto eq 'enabled') { +$OUT .= <<'_EOF'; +CONFIG_mailcontent=$MAILCONTENT +CONFIG_mail_maxattsize=$SIZEMAIL +CONFIG_mail_splitandtar='yes' +CONFIG_mail_address=$MAILTO +CONFIG_encrypt=$ENCRYPT +CONFIG_encrypt_password=$DBENCRYPT_PASSWORD +CONFIG_backup_local_files=($BACKUP_LOCAL_FILES) +umask 0077 +_EOF +} +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2018-07-06 11:54:05.456758697 +0200 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2018-07-09 14:13:37.582049862 +0200 @@ -1 +1,9 @@ -{${'automysqlbackup'}{'Minute'}||'1'} {${'automysqlbackup'}{'Hour'}||'3'} * * * root /sbin/e-smith/runmysqlbackup +{ +my $my53 = ${'mysqld'}{'status'} || 'disabled'; + +return '' unless $my53 eq 'enabled'; +my $minutes= ${'automysqlbackup'}{'Minute'}||'1'; +my $hours= ${'automysqlbackup'}{'Hour'}||'3'; +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/myserver.conf > /dev/null\n"; + +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/20mysql55 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/20mysql55 2018-07-09 14:13:37.583049912 +0200 @@ -0,0 +1,9 @@ +{ +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; + +return '' unless $my55 eq 'enabled'; +my $minutes= ${'automysqlbackup'}{'Minute'}||'1'; +my $hours= ${'automysqlbackup'}{'Hour'}||'3'; +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mysql55.conf > /dev/null\n"; + +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/21mysql57 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/21mysql57 2018-07-09 14:13:37.583049912 +0200 @@ -0,0 +1,9 @@ +{ +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; + +return '' unless $my57 eq 'enabled'; +my $minutes= ${'automysqlbackup'}{'Minute'}||'1'; +my $hours= ${'automysqlbackup'}{'Hour'}||'3'; +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mysql57.conf > /dev/null\n"; + +} \ No newline at end of file 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 --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/22mymaria 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/22mymaria 2018-07-09 14:13:37.584049962 +0200 @@ -0,0 +1,9 @@ +{ +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; + +return '' unless $mymaria eq 'enabled'; +my $minutes= ${'automysqlbackup'}{'Minute'}||'1'; +my $hours= ${'automysqlbackup'}{'Hour'}||'3'; +$OUT = "$minutes $hours * * * root /sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mymaria.conf > /dev/null\n"; + +} \ No newline at end of file diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/sbin/e-smith/runmysqlbackup smeserver-automysqlbackup-3.0.RC6/root/sbin/e-smith/runmysqlbackup --- smeserver-automysqlbackup-3.0.RC6.old/root/sbin/e-smith/runmysqlbackup 2018-07-06 11:54:05.456758697 +0200 +++ smeserver-automysqlbackup-3.0.RC6/root/sbin/e-smith/runmysqlbackup 2018-07-09 14:13:37.584049962 +0200 @@ -1,6 +1,6 @@ #!/bin/sh -/usr/local/bin/automysqlbackup /etc/automysqlbackup/myserver.conf >/dev/null +/usr/local/bin/automysqlbackup >/dev/null chown root:root /root/backup/db* -R find /root/backup/db* -type f -exec chmod 400 {} \;