smeserver/smeserver-mysql
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fri Mar 07 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme

Browse Source 
- upgrade to support mariadb 11.4 [SME: 12930]
  move mariadb-upgrade to mysql.init unit, remove duplicate in 00_restore_dumped_dbs and 10mysql_upgrade
  add our tmp.d
  add post action dnf script
  update mariadb.service.d/  content
  set default to utfmb4
- TODO mysql.dump filtering [SME: 12592]
- TODO feedback plugin [SME: 12897]

* Sun Jan 26 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
- prestart script requires daemontools bins [SME: 12566]
This commit is contained in:
Jean-Philippe Pialasse 2025-03-07 22:58:08 -05:00
parent afcd41481e
commit 040ed0e99f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
root/etc/e-smith/templates/etc/e-smith/sql/init/00_restore_dumped_dbs
View File

@ -2,11 +2,11 @@
( cat /home/e-smith/db/mysql/mysql.dump ; ( cat /home/e-smith/db/mysql/mysql.dump ;
cat /var/lib/mysql.private/set.password ) | mysql || exit 1 cat /var/lib/mysql.private/set.password ) | mysql || exit 1
/bin/rm /var/run/mariadb/mariadb.pid /bin/rm /run/mariadb/mariadb.pid
/usr/bin/systemctl restart mariadb.service /usr/bin/systemctl restart mariadb.service
for i in $(seq 1 20); for i in $(seq 1 20);
do do
if [ -f /var/run/mariadb/mariadb.pid ] if [ -f /run/mariadb/mariadb.pid ]
then then
/bin/rm /home/e-smith/db/mysql/mysql.dump /bin/rm /home/e-smith/db/mysql/mysql.dump
exit 0 exit 0

2
root/etc/e-smith/templates/etc/my.cnf/006pid-file
View File

@ -1 +1 @@
pid-file=/var/run/mariadb/mariadb.pid pid-file=/run/mariadb/mariadb.pid

4
root/usr/lib/systemd/system/mariadb.service.d/50koozali.conf
View File

@ -9,7 +9,7 @@ PermissionsStartOnly=true
#reset #reset
ExecStartPre= ExecStartPre=
ExecStartPre=/usr/bin/install -d /var/run/mariadb -o mysql -g mysql -m 0755 ExecStartPre=/usr/bin/install -d /run/mariadb -o mysql -g mysql -m 0755
# add mariadb >=10.6 specifics # add mariadb >=10.6 specifics
ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION" ExecStartPre=/bin/sh -c "systemctl unset-environment _WSREP_START_POSITION"
@ -34,7 +34,7 @@ ExecStart=/usr/sbin/mariadbd \
--basedir=/usr \ --basedir=/usr \
--datadir=/var/lib/mysql \ --datadir=/var/lib/mysql \
--user=mysql \ --user=mysql \
--pid-file=/var/run/mariadb/mariadb.pid --pid-file=/run/mariadb/mariadb.pid
ExecStartPost=-/sbin/e-smith/systemd/mariadb-post ExecStartPost=-/sbin/e-smith/systemd/mariadb-post

2
root/usr/lib/tmpfiles.d/smemariadb.conf
View File

@ -1 +1 @@
d /var/run/mariadb 0755 mysql mysql - d /run/mariadb 0755 mysql mysql -