diff -Nur smeserver-automysqlbackup-3.0.RC6.old/createlinks smeserver-automysqlbackup-3.0.RC6/createlinks --- smeserver-automysqlbackup-3.0.RC6.old/createlinks 2019-09-22 11:08:45.785000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/createlinks 2019-10-02 23:50:31.337000000 -0400 @@ -13,7 +13,7 @@ /etc/automysqlbackup/mysql55.conf /etc/automysqlbackup/mysql57.conf /etc/automysqlbackup/mymaria.conf - + /etc/e-smith/sql/init/automysqlbackup )) { templates2events( @@ -24,3 +24,13 @@ ) ); } + +# add action /etc/e-smith/events/actions/automysqlbackup to automysqlbackup-update bootstrap-console-save +foreach my $event (qw(automysqlbackup-update bootstrap-console-save)){ + event_link("automysqlbackup", $event, "15"); +} + +# add mysql.init restart to automysqlbackup-update +for my $event (qw(automysqlbackup-update)){ +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");; +} diff -Nur 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 2019-09-22 11:08:45.786000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mymaria 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -disabled \ Pas de fin de ligne à la fin du fichier diff -Nur 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 2019-09-22 11:08:45.786000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql53 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -enabled \ Pas de fin de ligne à la fin du fichier diff -Nur 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 2019-09-22 11:08:45.787000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql55 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -disabled \ Pas de fin de ligne à la fin du fichier diff -Nur 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 2019-09-22 11:08:45.787000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/defaults/automysqlbackup/Mysql57 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -disabled \ Pas de fin de ligne à la fin du fichier diff -Nur smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/migrate/85automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/migrate/85automysqlbackup --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/db/configuration/migrate/85automysqlbackup 2014-08-17 16:32:37.000000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/db/configuration/migrate/85automysqlbackup 2019-11-25 22:36:35.789000000 -0500 @@ -9,4 +9,9 @@ $rec->set_prop('DbPassword', $pw); } +# if mysql53 exists; ie before tidying the contrib : there is no mysql53 on SME, 5.1 or 5.5 +#delete Mymaria Mysql53 Mysql55 Mysql57; so we use the default as hardcoded in scripts +if ( defined $rec->prop('Mysql53') ){ + $rec->delete_prop($_) for ( qw(Mymaria Mysql53 Mysql55 Mysql57) ); +} } diff -Nur smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/events/actions/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/events/actions/automysqlbackup --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/events/actions/automysqlbackup 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/events/actions/automysqlbackup 2019-10-02 23:45:02.581000000 -0400 @@ -0,0 +1,25 @@ +#!/bin/bash + + + +#check if mysql55 is instelled and enabled, if yes expand sql/init55 and restar mysql55-mysql.init + +status55=`/sbin/e-smith/db configuration getprop mysql55-mysqld status|| echo "disabled"` + +if [ $status55 == "enabled" ]; then + + /sbin/e-smith/expand-template /etc/e-smith/sql/init55/automysqlbackup + /sbin/e-smith/service mysql55-mysql.init restart + +fi + +#check if mysql57 is installed and enabled, if yes expand sql/init57 and restar mysql57-mysql.init +status57=`/sbin/e-smith/db configuration getprop mysql57-mysqld status|| echo "disabled"` + +if [ $status57 == "enabled" ]; then + + /sbin/e-smith/expand-template /etc/e-smith/sql/init57/automysqlbackup + /sbin/e-smith/service mysql57-mysql.init restart + +fi + diff -Nur 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 2019-09-22 11:08:45.787000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start 2019-09-22 12:29:19.921000000 -0400 @@ -1,7 +1,9 @@ { my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled'; -if ($mymaria eq 'enabled' && $myauto eq 'enabled') { +my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'enabled'; +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; + +if ($status eq 'enabled') { $OUT .= <<'_EOF'; #version=3.0_rc2 # DONT'T REMOVE THE PREVIOUS VERSION LINE! @@ -15,4 +17,4 @@ $OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; $OUT .= "# Automysqlbackup disabled\n"; } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.787000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/20db 2019-09-22 12:33:13.017000000 -0400 @@ -1,7 +1,5 @@ { -my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled'; -if ($mymaria eq 'enabled' && $myauto eq 'enabled') { +if ($status eq 'enabled') { $OUT .= <<'_EOF'; # DB Specific CONFIG_backup_dir=${BACKUPDIR}_mymaria @@ -11,4 +9,4 @@ # End _EOF } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.787000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/30end 2019-09-22 12:33:01.067000000 -0400 @@ -1,7 +1,5 @@ { -my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'disabled'; -if ($mymaria eq 'enabled' && $myauto eq 'enabled') { +if ($status eq 'enabled') { $OUT .= <<'_EOF'; CONFIG_mailcontent=$MAILCONTENT CONFIG_mail_maxattsize=$SIZEMAIL @@ -13,4 +11,4 @@ umask 0077 _EOF } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.788000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/10start 2019-10-03 13:17:34.546000000 -0400 @@ -1,7 +1,7 @@ { -my $my53 = ${'mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled'; -if ($my53 eq 'enabled' && $myauto eq 'enabled') { +my $my51 = ${'mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql51'} || 'enabled'; +if ($my51 eq 'enabled' && $myauto eq 'enabled') { $OUT .= <<'_EOF'; #version=3.0_rc2 # DONT'T REMOVE THE PREVIOUS VERSION LINE! @@ -16,4 +16,4 @@ $OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; $OUT .= "# Automysqlbackup disabled\n"; } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.788000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/20db 2019-10-03 11:58:59.334000000 -0400 @@ -1,7 +1,7 @@ { -my $my53 = ${'mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled'; -if ($my53 eq 'enabled' && $myauto eq 'enabled') { +my $my51 = ${'mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql51'} || 'enabled'; +if ($my51 eq 'enabled' && $myauto eq 'enabled') { $OUT .= "CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock'\n"; } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.788000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/myserver.conf/30end 2019-10-03 13:18:09.974000000 -0400 @@ -1,7 +1,7 @@ { -my $my53 = ${'mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql53'} || 'disabled'; -if ($my53 eq 'enabled' && $myauto eq 'enabled') { +my $my51 = ${'mysqld'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mysql51'} || 'enabled'; +if ($my51 eq 'enabled' && $myauto eq 'enabled') { $OUT .= <<'_EOF'; CONFIG_mailcontent=$MAILCONTENT CONFIG_mail_maxattsize=$SIZEMAIL @@ -13,4 +13,4 @@ umask 0077 _EOF } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.788000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/10start 2019-09-22 12:30:15.348000000 -0400 @@ -1,7 +1,9 @@ { my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled'; -if ($my55 eq 'enabled' && $myauto eq 'enabled') { +my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'enabled'; +our $status = ( $my55 eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; + +if ($status eq 'enabled') { $OUT .= <<'_EOF'; #version=3.0_rc2 # DONT'T REMOVE THE PREVIOUS VERSION LINE! @@ -15,4 +17,4 @@ $OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; $OUT .= "# Automysqlbackup disabled\n"; } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.788000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/20db 2019-09-22 12:32:24.457000000 -0400 @@ -1,7 +1,5 @@ { -my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled'; -if ($my55 eq 'enabled' && $myauto eq 'enabled') { +if ($status eq 'enabled') { $OUT .= <<'_EOF'; # DB Specific CONFIG_backup_dir=${BACKUPDIR}_mysql55 @@ -11,4 +9,4 @@ # End _EOF } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.789000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql55.conf/30end 2019-09-22 12:32:42.293000000 -0400 @@ -1,7 +1,5 @@ { -my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql55'} || 'disabled'; -if ($my55 eq 'enabled' && $myauto eq 'enabled') { +if ($status eq 'enabled') { $OUT .= <<'_EOF'; CONFIG_mailcontent=$MAILCONTENT CONFIG_mail_maxattsize=$SIZEMAIL @@ -13,4 +11,4 @@ umask 0077 _EOF } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.789000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/10start 2019-09-22 12:31:30.680000000 -0400 @@ -1,7 +1,9 @@ { my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled'; -if ($my57 eq 'enabled' && $myauto eq 'enabled') { +my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'enabled'; +our $status = ( $my57 eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; + +if ($status eq 'enabled') { $OUT .= <<'_EOF'; #version=3.0_rc2 # DONT'T REMOVE THE PREVIOUS VERSION LINE! @@ -15,4 +17,4 @@ $OUT .= "# DONT'T REMOVE THE PREVIOUS VERSION LINE!\n"; $OUT .= "# Automysqlbackup disabled\n"; } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.789000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db 2019-09-22 12:31:51.823000000 -0400 @@ -1,7 +1,5 @@ { -my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled'; -if ($my57 eq 'enabled' && $myauto eq 'enabled') { +if ($status eq 'enabled') { $OUT .= <<'_EOF'; # DB Specific CONFIG_backup_dir=${BACKUPDIR}_mysql57 @@ -11,4 +9,4 @@ # End _EOF } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.789000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/30end 2019-09-22 12:32:09.602000000 -0400 @@ -1,7 +1,5 @@ { -my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; -my $myauto = ${'automysqlbackup'}{'Mysql57'} || 'disabled'; -if ($my57 eq 'enabled' && $myauto eq 'enabled') { +if ($status eq 'enabled') { $OUT .= <<'_EOF'; CONFIG_mailcontent=$MAILCONTENT CONFIG_mail_maxattsize=$SIZEMAIL @@ -13,4 +11,4 @@ umask 0077 _EOF } -} \ Pas de fin de ligne à la fin du fichier +} diff -Nur 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 2019-09-22 11:08:45.789000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2019-09-22 11:47:34.746000000 -0400 @@ -1,9 +1,24 @@ { -my $my53 = ${'mysqld'}{'status'} || 'disabled'; +my $my51 = ${'mysqld'}{'status'} || 'disabled'; +$my51 = ( ( ( ${'automysqlbackup'}{'Mysql51'} || 'enabled' ) eq "enabled" ) and ( $my51 eq "enabled" ) ) ? "enabled" : "disabled"; +my $my55 = ${'mysql55-mysqld'}{'status'} || 'disabled'; +$my55 = ( ( ( ${'automysqlbackup'}{'Mysql55'} || 'enabled' ) eq "enabled" ) and ( $my55 eq "enabled" ) ) ? "enabled" : "disabled"; +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; +$my57 = ( ( ( ${'automysqlbackup'}{'Mysql57'} || 'enabled' ) eq "enabled" ) and ( $my57 eq "enabled" ) ) ? "enabled" : "disabled"; +my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; +$mymaria = ( ( ( ${'automysqlbackup'}{'Mymaria'} || 'enabled' ) eq "enabled" ) and ( $mymaria eq "enabled") ) ? "enabled" : "disabled"; -return '' unless $my53 eq 'enabled'; +return '' unless $my51 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"; +$OUT = "$minutes $hours * * * root "; + +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/myserver.conf ' ' > /dev/null ; " if $my51 eq "enabled"; +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mysql55.conf '_mysql55' > /dev/null ; " if $my55 eq "enabled"; +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mysql57.conf '_mysql57' > /dev/null ; " if $my57 eq "enabled"; +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mymaria.conf '_mymaria' > /dev/null ; " if $mymaria eq "enabled"; + +$OUT .= "\n"; + +} -} \ Pas de fin de ligne à la fin du fichier diff -Nur 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 2019-09-22 11:08:45.789000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/20mysql55 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -{ -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"; - -} \ Pas de fin de ligne à la fin du fichier diff -Nur 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 2019-09-22 11:08:45.789000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/21mysql57 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -{ -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"; - -} \ Pas de fin de ligne à la fin du fichier diff -Nur 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 2019-09-22 11:08:45.790000000 -0400 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/22mymaria 1969-12-31 19:00:00.000000000 -0500 @@ -1,9 +0,0 @@ -{ -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"; - -} \ Pas de fin de ligne à la fin du fichier diff -Nur smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup 2019-10-02 22:15:09.804000000 -0400 @@ -0,0 +1,37 @@ +{ +my $user = $automysqlbackup{'DbUser'} || 'backupuser'; +my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup'; +my $status = ${'mysql55-mysqld'}{'status'} || 'disabled'; + +$OUT = "#! /bin/sh +"; + +if ( "$status" eq "enabled" ) { + +$OUT .= <<"END"; +HOME="/root/"; +/opt/rh/mysql55/root/usr/bin/mysql --socket=/var/lib/mysql/mysql55.sock </dev/null @@ -8,6 +8,8 @@ DB="/root/backup/db"; fi -chown root:root $DB* -R -find $DB* -type f -exec chmod 400 {} \; -find $DB* -type d -exec chmod 700 {} \; +if [[ "$DB" =~ "^/root/backup" ]] || [[ "$DB" =~ "^/home/e-smith/db/" ]] ; then + chown root:root $DB$2 -R + find $DB$2 -type f -exec chmod 400 {} \; + find $DB$2 -type d -exec chmod 700 {} \; +fi diff -Nur 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 2019-11-26 13:27:03.395000000 -0500 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mysql57.conf/20db 2019-11-26 13:30:23.571000000 -0500 @@ -4,7 +4,7 @@ # DB Specific CONFIG_backup_dir=${BACKUPDIR}_mysql57 CONFIG_mysql_dump_full_schema='no' -CONFIG_db_exclude=( 'performance_schema' 'sys' ) +CONFIG_db_exclude=( 'information_schema' 'performance_schema' 'sys' ) CONFIG_mysql_dump_socket='/var/lib/mysql/mysql57.sock' # End _EOF