diff -ruN smeserver-automysqlbackup-3.0.RC6.old/createlinks smeserver-automysqlbackup-3.0.RC6/createlinks --- smeserver-automysqlbackup-3.0.RC6.old/createlinks 2022-06-08 09:34:57.638775325 +0100 +++ smeserver-automysqlbackup-3.0.RC6/createlinks 2022-06-08 10:57:53.238251378 +0100 @@ -17,11 +17,15 @@ /etc/automysqlbackup/mymaria103.conf /etc/automysqlbackup/mymaria105.conf /etc/e-smith/sql/init/automysqlbackup + /etc/e-smith/sql/init57/automysqlbackup + /etc/e-smith/sql/init101/automysqlbackup + /etc/e-smith/sql/init102/automysqlbackup + /etc/e-smith/sql/init103/automysqlbackup + /etc/e-smith/sql/init105/automysqlbackup )) { templates2events( "$_", qw( - automysqlbackup-update smeserver-automysqlbackup-update console-save bootstrap-console-save @@ -29,16 +33,22 @@ ); } +# Not required I think + # add action /etc/e-smith/events/actions/automysqlbackup to automysqlbackup-update bootstrap-console-save -foreach my $event (qw( automysqlbackup-update - smeserver-automysqlbackup-update - bootstrap-console-save)){ - event_link("automysqlbackup", $event, "15"); -} +#foreach my $event (qw( smeserver-automysqlbackup-update +# bootstrap-console-save)) +# { +# event_link("automysqlbackup", $event, "15"); +#} # add mysql.init restart to automysqlbackup-update -for my $event (qw( automysqlbackup-update - smeserver-automysqlbackup-update -)){ -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");; +foreach my $event (qw( smeserver-automysqlbackup-update)) + { + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb57-mysql.init"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb101-mysql.init"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb102-mysql.init"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb103-mysql.init"); + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb105-mysql.init"); } 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 2022-06-08 09:34:57.633775242 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/cron.d/runmysqlbackup/10base 2022-06-08 10:53:44.124128960 +0100 @@ -1,22 +1,31 @@ { -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 = ${'mariadb'}{'status'} || 'disabled'; $mymaria = ( ( ( ${'automysqlbackup'}{'Mymaria'} || 'enabled' ) eq "enabled" ) and ( $mymaria eq "enabled") ) ? "enabled" : "disabled"; +my $my57 = ${'mysql57-mysqld'}{'status'} || 'disabled'; +$my57 = ( ( ( ${'automysqlbackup'}{'Mysql57'} || 'enabled' ) eq "enabled" ) and ( $my57 eq "enabled" ) ) ? "enabled" : "disabled"; + +my $my101 = ${'mariadb101-mariadb'}{'status'} || 'disabled'; +$my101 = ( ( ( ${'automysqlbackup'}{'Mymaria101'} || 'enabled' ) eq "enabled" ) and ( $my101 eq "enabled" ) ) ? "enabled" : "disabled"; +my $my102 = ${'mariadb102-mariadb'}{'status'} || 'disabled'; +$my102 = ( ( ( ${'automysqlbackup'}{'Mymaria102'} || 'enabled' ) eq "enabled" ) and ( $my102 eq "enabled" ) ) ? "enabled" : "disabled"; +my $my103 = ${'mariadb103-mariadb'}{'status'} || 'disabled'; +$my103 = ( ( ( ${'automysqlbackup'}{'Mymaria101'} || 'enabled' ) eq "enabled" ) and ( $my103 eq "enabled" ) ) ? "enabled" : "disabled"; +my $my105 = ${'mariadb105-mariadb'}{'status'} || 'disabled'; +$my105 = ( ( ( ${'automysqlbackup'}{'Mymaria105'} || 'enabled' ) eq "enabled" ) and ( $my105 eq "enabled" ) ) ? "enabled" : "disabled"; + +#return '' unless $mymymaria eq 'enabled'; -#return '' unless $my51 eq 'enabled'; my $minutes= ${'automysqlbackup'}{'Minute'}||'1'; my $hours= ${'automysqlbackup'}{'Hour'}||'3'; $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 .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mysql57.conf '_mysql57' > /dev/null ; " if $my57 eq "enabled"; +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mymaria101.conf '_mysql101' > /dev/null ; " if $my101 eq "enabled"; +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mymaria102.conf '_mysql102' > /dev/null ; " if $my102 eq "enabled"; +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mymaria103.conf '_mysql103' > /dev/null ; " if $my103 eq "enabled"; +$OUT .= "/sbin/e-smith/runmysqlbackup /etc/automysqlbackup/mymaria105.conf '_mysql105' > /dev/null ; " if $my105 eq "enabled"; $OUT .= "\n"; diff -ruN smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup --- smeserver-automysqlbackup-3.0.RC6.old/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup 2022-06-08 09:34:57.634775259 +0100 +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/e-smith/sql/init105/automysqlbackup 2022-06-08 10:53:44.124128960 +0100 @@ -13,27 +13,13 @@ /opt/rh/rh-mariadb105/root/usr/bin/mysql --socket=/var/lib/mysql/mariadb105.sock <