Compare commits
8 Commits
11_0_0-4_e
...
11_0_0-8_e
Author | SHA1 | Date | |
---|---|---|---|
34effb2c39 | |||
375ec52f86 | |||
56d3583079 | |||
1b23159978 | |||
2cea9d23a1 | |||
671a8d6e5f | |||
8e8cdfd86f | |||
c8c2aa10bd |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
*.log
|
||||
*spec-20*
|
||||
*.tar.xz
|
||||
*.bak
|
||||
|
@@ -11,7 +11,14 @@ SMEServer Koozali developed git repo for smeserver-mysql smeserver
|
||||
<br />https://wiki.koozali.org/Software_Collections:MySQL
|
||||
|
||||
## Bugzilla
|
||||
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-mysql&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
||||
Show list of outstanding bugs:
|
||||
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-mysql&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-mysql&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-mysql&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-mysql&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-mysql&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-mysql&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-mysql&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
|
||||
## Description
|
||||
|
||||
|
55
createlinks
55
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");
|
||||
}
|
||||
|
||||
|
||||
|
@@ -39,3 +39,15 @@ for db in $(mysql -BNre "show databases;"|egrep -vi "^information_schema$|^perfo
|
||||
do
|
||||
mysqldump --ignore-table=mysql.event --single-transaction --add-drop-table -QB "$db" -r /home/e-smith/db/mysql/"$db".dump || onfailure $db
|
||||
done
|
||||
# dump user privileges
|
||||
mysqldump --system=users --insert-ignore > /home/e-smith/db/mysql/system-users-priv.dump
|
||||
# dump plugins
|
||||
mysqldump --system=plugins --insert-ignore > /home/e-smith/db/mysql/system-plugins.dump
|
||||
# dump udfs
|
||||
mysqldump --system=udfs --insert-ignore > /home/e-smith/db/mysql/system-udfs.dump
|
||||
# dump servers
|
||||
mysqldump --system=servers --insert-ignore > /home/e-smith/db/mysql/system-servers.dump
|
||||
# dump stats
|
||||
mysqldump --system=stats --insert-ignore > /home/e-smith/db/mysql/system-stats.dump
|
||||
# dump timezones
|
||||
mysqldump --system=timezones --insert-ignore > /home/e-smith/db/mysql/system-timezones.dump
|
||||
|
0
root/var/lib/mysql.private/.gitignore
vendored
Normal file
0
root/var/lib/mysql.private/.gitignore
vendored
Normal file
@@ -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 8
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -17,6 +17,8 @@ Requires: /usr/bin/mysql_upgrade
|
||||
Requires: mariadb > 10.5.0
|
||||
Requires: smeserver-base
|
||||
Requires: smeserver-lib >= 1.15.1-19
|
||||
# daemontools bins in use
|
||||
Requires: /usr/bin/setuidgid
|
||||
Provides: e-smith-mysql = 2.7.0
|
||||
Obsoletes: e-smith-mysql < 2.7.0
|
||||
BuildRequires: smeserver-devtools >= 1.13.1-03
|
||||
@@ -66,7 +68,16 @@ fi
|
||||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
* Fri Apr 05 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
|
||||
* Sun Jan 26 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
|
||||
- prestart script requires daemontools bins [SME: 12566]
|
||||
|
||||
* Mon Apr 08 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
|
||||
- add missing mysql.private folder [SME: 11856]
|
||||
|
||||
* Sat Apr 06 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-6.sme
|
||||
- backup users priv, plugins, udfs, servers, stats, timezones [SME: 12591]
|
||||
|
||||
* Fri Apr 05 2024 Jean-Philippe Pialasse <jpp@koozali.org> 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]
|
||||
|
Reference in New Issue
Block a user