From c8c2aa10bd0ab6baabaa9d0cc786241462787e19 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Sat, 6 Apr 2024 01:01:49 -0400 Subject: [PATCH] * Fri Apr 05 2024 Jean-Philippe Pialasse 11.0.0-5.sme - tidy spec and sources for mariadb10.5 support [SME: 12524] - try to make compatible with higher version from mariadb repo [SME: 11856] - fix logrotate duplicate entry [SME: 12554] * Thu Apr 04 2024 Brian Read 11.0.0-3.sme - Set license file to GPL2.0 [SME: 12577] --- createlinks | 55 ++------------------------------------------ smeserver-mysql.spec | 4 ++-- 2 files changed, 4 insertions(+), 55 deletions(-) diff --git a/createlinks b/createlinks index 10d530e..032607d 100755 --- a/createlinks +++ b/createlinks @@ -1,7 +1,6 @@ #!/usr/bin/perl -w use esmith::Build::CreateLinks qw(:all); -my @versions = ( 101, 102, 103, 105); #-------------------------------------------------- # pre-backup actions @@ -11,12 +10,6 @@ my $event = "pre-backup"; event_link("mysql-delete-dumped-tables", $event, "10"); event_link("mysql-dump-tables", $event, "20"); -foreach ( @versions) -{ - event_link("mariadb$_-delete-dumped-tables", $event, "10"); - event_link("mariadb$_-dump-tables", $event, "20"); -} - #-------------------------------------------------- # post-backup actions #-------------------------------------------------- @@ -25,12 +18,6 @@ $event = "post-backup"; # Probably don't really need to do this event_link("mysql-delete-dumped-tables", $event, "10"); -foreach ( @versions) -{ - event_link("mariadb$_-delete-dumped-tables", $event, "10"); -} - - # When we do a restore, we want to start from a completely clean slate $event = "pre-restore"; @@ -38,13 +25,6 @@ safe_symlink("stop", "root/etc/e-smith/events/$event/services2adjust/mariadb"); # Needs to be after shutdown of mysqld event_link("mysql-delete-db-files", $event, "99"); -foreach ( @versions) -{ - safe_symlink("stop", "root$_/etc/e-smith/events/$event/services2adjust/mariadb$_-mariadb"); - event_link("mariadb$_-delete-db-files", $event, "99"); -} - - #-------------------------------------------------- # actions for bootstrap-console-save event #-------------------------------------------------- @@ -53,7 +33,7 @@ $event = "bootstrap-console-save"; foreach (qw( /etc/my.cnf /root/.my.cnf - /var/lib/mysql/set.password + /var/lib/mysql.private/set.password )) { templates2events("$_", $event); @@ -64,13 +44,6 @@ event_link("mysql-load-tables", $event, "40"); templates2events("/etc/e-smith/sql/init/10mysql_upgrade", $event); -foreach ( @versions) -{ - templates2events("/etc/opt/rh/rh-mariadb$_/my.cnf", $event); - templates2events("/etc/e-smith/sql/init$_/10mysql_upgrade", $event); - event_link("mariadb$_-load-tables", $event, "40"); -} - #-------------------------------------------------- # actions for timezone-update event #-------------------------------------------------- @@ -78,11 +51,6 @@ $event = "timezone-update"; safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb"); -foreach ( @versions) -{ - safe_symlink("restart", "root$_/etc/e-smith/events/$event/services2adjust/mariadb$_-mariadb"); -} - #-------------------------------------------------- # actions for smeserver-mysql-update event #-------------------------------------------------- @@ -91,7 +59,7 @@ $event = "smeserver-mysql-update"; foreach (qw( /etc/my.cnf /root/.my.cnf - /var/lib/mysql/set.password + /var/lib/mysql.private/set.password )) { templates2events("$_", $event); @@ -109,23 +77,4 @@ templates2events("/etc/rsyslog.conf", $event); event_link("systemd-reload", $event, "89"); event_link("systemd-default", $event, "88"); -foreach ( @versions) -{ -$event = "smeserver-mariadb$_-update"; -templates2events("/etc/my.cnf", $event); -templates2events("/root/.my.cnf", $event); -templates2events("/var/lib/mysql/set.password", $event); -templates2events("/var/lib/mysql/set.password2", $event); -templates2events("/etc/phpMyAdmin/config.inc.php", $event); -templates2events("/etc/opt/rh/rh-mariadb$_/my.cnf", $event); -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb$_-mariadb"); -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mariadb$_-mysql.init"); -event_link("mariadb$_-load-tables", $event, "40"); -templates2events("/etc/e-smith/sql/init$_/10mysql_upgrade", $event); - -# systemd-specific action mandatory for this package-update event -event_link("systemd-reload", $event, "89"); -event_link("systemd-default", $event, "88"); -} - diff --git a/smeserver-mysql.spec b/smeserver-mysql.spec index c799b00..fc3e302 100644 --- a/smeserver-mysql.spec +++ b/smeserver-mysql.spec @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mysql configuration and templates. %define name smeserver-mysql Name: %{name} %define version 11.0.0 -%define release 4 +%define release 5 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -66,7 +66,7 @@ fi %defattr(-,root,root) %changelog -* Fri Apr 05 2024 Jean-Philippe Pialasse 11.0.0-4.sme +* Fri Apr 05 2024 Jean-Philippe Pialasse 11.0.0-5.sme - tidy spec and sources for mariadb10.5 support [SME: 12524] - try to make compatible with higher version from mariadb repo [SME: 11856] - fix logrotate duplicate entry [SME: 12554]