--- rpms/smeserver-mysql/sme10/smeserver-mysql.spec	2022/03/13 23:25:36	1.6
+++ 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 3
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -50,7 +50,7 @@ do
 # default values from /etc/opt/rh/rh-mariadb101/my.cnf.d/mariadb-server.cnf
 basedir="/opt/rh/rh-mariadb$ver/root/usr"
 datadir="/var/opt/rh/rh-mariadb$ver/lib/mysql"
-socket="/var/lib/mysql/maradb$ver.sock"
+socket="/var/lib/mysql/mariadb$ver.sock"
 logerror="/var//log/mariadb$ver/mariadb.log"
 #"/var/opt/rh/rh-mariadb$ver/log/mariadb/mariadb.log"
 pidfile="/var/run/rh-mariadb$ver-mariadb/mariadb.pid"
@@ -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/
@@ -181,18 +187,28 @@ then
   sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \
 	-e "s/_safe//";
 fi
+if [ $ver -ge  104 ]
+then
+  sed -i root$ver/usr/lib/systemd/system/mariadb${ver}-mariadb.service \
+	-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
-  echo "/opt/rh/rh-mariadb${ver}/root/usr/bin/$i --socket=/var/lib/mysql/maradb${ver}.sock \"\$@\"" >root$ver/usr/bin/$i${ver}
+  echo "/opt/rh/rh-mariadb${ver}/root/usr/bin/$i --socket=/var/lib/mysql/mariadb${ver}.sock \"\$@\"" >root$ver/usr/bin/$i${ver}
 done
 
 #phpMyAdmin template
+mkdir -p root$ver/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/
 sed rootscl/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql_VER_  \
+	-e "s_!!!SOCKET!!!_${socket}_g" \
 	-e "s_!!!VER!!!_${ver}_g" > root$ver/etc/e-smith/templates/etc/phpMyAdmin/config.inc.php/11configMysql${ver} 
 
 done
@@ -220,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)' \
@@ -305,7 +322,7 @@ Requires:       rh-mariadb105
 Requires:       rh-mariadb105-mariadb
 Requires:       rh-mariadb105-mariadb-server
 BuildRequires:  e-smith-devtools >= 1.13.1-03
-
+Requires: 	smeserver-mysql >= 2.7.0-5
 %description    -n smeserver-mariadb105
 Koozali SME Server configuration package for mariadb105 RH SCLo
 
@@ -317,6 +334,14 @@ Koozali SME Server configuration package
 
 
 %changelog
+* Mon Mar 14 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-6.sme
+- fix password for mariadb 105 [SME: 11899]
+
+* Sun Mar 13 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-5.sme
+- fix typo in socket, seen with phpmyadmin [SME: 11899]
+- fix permissions for mariadb105 [SME: 11899]
+  create a dedicated set.password for mariadb>103
+
 * Sun Mar 13 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.7.0-3.sme
 - missing phpMyAdmin fragments [SME: 11899]