--- rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-support.patch 2022/05/09 15:08:15 1.1 +++ rpms/smeserver-automysqlbackup/contribs10/smeserver-automysqlbackup-3.0.RC6-bz11970.Add-Maria-10x-support.patch 2022/05/31 14:44:08 1.2 @@ -19,7 +19,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria101.conf/10start 2022-05-09 14:28:22.662198871 +0100 @@ -0,0 +1,20 @@ +{ -+my $mymaria = ${'mariadb101'}{'status'} || 'disabled'; ++my $mymaria = ${'mariadb101-mariadb'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mymaria101'} || 'enabled'; +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; + @@ -49,7 +49,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +CONFIG_backup_dir=${BACKUPDIR}_mymaria +CONFIG_mysql_dump_full_schema='no' +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' ) -+CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock' ++CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb101.sock' +# End +_EOF +} @@ -77,7 +77,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria102.conf/10start 2022-05-09 14:29:20.750155084 +0100 @@ -0,0 +1,20 @@ +{ -+my $mymaria = ${'mariadb102'}{'status'} || 'disabled'; ++my $mymaria = ${'mariadb102-mariadb'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mymaria102'} || 'enabled'; +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; + @@ -107,7 +107,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +CONFIG_backup_dir=${BACKUPDIR}_mymaria +CONFIG_mysql_dump_full_schema='no' +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' ) -+CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock' ++CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb102.sock' +# End +_EOF +} @@ -135,7 +135,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria103.conf/10start 2022-05-09 14:29:37.342428217 +0100 @@ -0,0 +1,20 @@ +{ -+my $mymaria = ${'mariadb103'}{'status'} || 'disabled'; ++my $mymaria = ${'mariadb103-mariadb'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mymaria103'} || 'enabled'; +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; + @@ -165,7 +165,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +CONFIG_backup_dir=${BACKUPDIR}_mymaria +CONFIG_mysql_dump_full_schema='no' +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' ) -+CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock' ++CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb103.sock' +# End +_EOF +} @@ -193,7 +193,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +++ smeserver-automysqlbackup-3.0.RC6/root/etc/e-smith/templates/etc/automysqlbackup/mymaria105.conf/10start 2022-05-09 14:29:56.013735574 +0100 @@ -0,0 +1,20 @@ +{ -+my $mymaria = ${'mariadb105'}{'status'} || 'disabled'; ++my $mymaria = ${'mariadb105-mariadb'}{'status'} || 'disabled'; +my $myauto = ${'automysqlbackup'}{'Mymaria105'} || 'enabled'; +our $status = ( $mymaria eq 'enabled' && $myauto eq 'enabled' ) ? 'enabled' : 'disabled'; + @@ -223,7 +223,7 @@ diff -ruN smeserver-automysqlbackup-3.0. +CONFIG_backup_dir=${BACKUPDIR}_mymaria +CONFIG_mysql_dump_full_schema='no' +CONFIG_db_exclude=( 'performance_schema' 'information_schema' 'sys' ) -+CONFIG_mysql_dump_socket='/var/lib/mysql/mysql.sock' ++CONFIG_mysql_dump_socket='/var/lib/mysql/mariadb105.sock' +# End +_EOF +}