diff -urN smeserver-automysqlbackup-3.0.RC6.old/createlinks smeserver-automysqlbackup-3.0.RC6/createlinks --- smeserver-automysqlbackup-3.0.RC6.old/createlinks 2021-01-26 15:20:46.060189687 +0000 +++ smeserver-automysqlbackup-3.0.RC6/createlinks 2021-01-28 10:58:17.294751410 +0000 @@ -19,6 +19,7 @@ templates2events( "$_", qw( automysqlbackup-update + smeserver-automysqlbackup-update console-save bootstrap-console-save ) @@ -26,11 +27,15 @@ } # add action /etc/e-smith/events/actions/automysqlbackup to automysqlbackup-update bootstrap-console-save -foreach my $event (qw(automysqlbackup-update bootstrap-console-save)){ +foreach my $event (qw( automysqlbackup-update + smeserver-automysqlbackup-update + bootstrap-console-save)){ event_link("automysqlbackup", $event, "15"); } # add mysql.init restart to automysqlbackup-update -for my $event (qw(automysqlbackup-update)){ +for my $event (qw( automysqlbackup-update + smeserver-automysqlbackup-update +)){ safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");; } diff -urN 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 2021-01-26 15:20:46.061189696 +0000 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/events/actions/automysqlbackup 2021-01-28 10:19:37.353352275 +0000 @@ -3,23 +3,19 @@ #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 - +#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 +#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 +# for SME10 MySQL is mariadb - no need for various options + /sbin/e-smith/expand-template /etc/e-smith/sql/init/automysqlbackup + /usr/bin/systemctl restart mysql.init -fi diff -urN 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 2021-01-26 15:20:46.062189706 +0000 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria.conf/10start 2021-01-28 10:30:00.985316790 +0000 @@ -1,5 +1,5 @@ { -my $mymaria = ${'mariadb55-mysqld'}{'status'} || 'disabled'; +my $mymaria = ${'mariadb'}{'status'} || 'disabled'; my $myauto = ${'automysqlbackup'}{'Mymaria'} || 'enabled'; our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; diff -urN 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 2021-01-26 15:20:46.065189734 +0000 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init/automysqlbackup 2021-01-26 16:38:28.466035572 +0000 @@ -1,7 +1,7 @@ { my $user = $automysqlbackup{'DbUser'} || 'backupuser'; my $pass = $automysqlbackup{'DbPassword'} || 'automysqlbackup'; -my $status = ${'mysql55-mysqld'}{'status'} || 'disabled'; +my $status = ${'mysql.init'}{'status'} || 'disabled'; $OUT = "#! /bin/sh "; @@ -10,7 +10,7 @@ $OUT .= <<"END"; HOME="/root/"; -/opt/rh/mysql55/root/usr/bin/mysql --socket=/var/lib/mysql/mysql55.sock <