--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/14 05:25:15 1.15 +++ rpms/smeserver-mysql/sme10/smeserver-mysql.spec 2022/03/14 06:51:53 1.18 @@ -2,7 +2,7 @@ Summary: Koozali SME Server specific mys %define name smeserver-mysql Name: %{name} %define version 2.7.0 -%define release 5 +%define release 6 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -160,7 +160,13 @@ cp rootscl/sbin/e-smith/mariadb_VER_-pre sed -i root$ver/sbin/e-smith/systemd/mariadb${ver}-initialize -i root$ver/sbin/e-smith/systemd/mariadb${ver}-mysql.init \ -i root$ver/sbin/e-smith/mariadb${ver}-preload \ -e "s_!!!VER!!!_${ver}_g" \ - -e "s_!!!SOCKET!!!_$socket _g" + -e "s_!!!SOCKET!!!_${socket}_g" +if [ $ver -ge 104 ] +then + cp rootscl/sbin/e-smith/systemd/mariadb_VER_-post root$ver/sbin/e-smith/systemd/mariadb${ver}-post + sed -i root$ver/sbin/e-smith/systemd/mariadb${ver}-post -e "s_!!!VER!!!_${ver}_g" -e "s_!!!SOCKET!!!_${socket}_g" +fi + ## logrotate mkdir -p root$ver/etc/logrotate.d/ @@ -184,12 +190,15 @@ fi if [ $ver -ge 104 ] then sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \ - -e 's_set.password$_set.password2_' + -e 's_set.password$_set.password2_' + sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \ + -e "/^#ExecStartPost=/ i ExecStartPost=\/sbin\/e-smith\/systemd\/mariadb${ver}-post" + fi #### TODO check it is similar to rh one and functional ! -#/usb/bin to ease user +#/usr/bin to ease user mkdir root$ver/usr/bin for i in mysql mysqlshow mysqladmin mysqldump mysqlimport mysqlbinlog do @@ -227,6 +236,7 @@ do /sbin/e-smith/genfilelist root$ver/ \ --file "/sbin/e-smith/systemd/mariadb$ver-initialize" 'attr(0554,root,root)' \ --file "/sbin/e-smith/systemd/mariadb$ver-mysql.init" 'attr(0554,root,root)' \ + --file "/sbin/e-smith/systemd/mariadb$ver-post" 'attr(0554,root,root)' \ --dir "/home/e-smith/db/mariadb$ver" 'attr(0750,root,root)' \ --dir "/var/log/mariadb$ver" 'attr(0750,mysql,mysql)' \ --file "/usr/bin/mysql$ver" 'attr(0554,root,root)' \ @@ -324,6 +334,9 @@ Koozali SME Server configuration package %changelog +* Mon Mar 14 2022 Jean-Philippe Pialasse 2.7.0-6.sme +- fix password for mariadb 105 [SME: 11899] + * Sun Mar 13 2022 Jean-Philippe Pialasse 2.7.0-5.sme - fix typo in socket, seen with phpmyadmin [SME: 11899] - fix permissions for mariadb105 [SME: 11899]