diff --git a/contriborbase b/contriborbase index 9b7fd51..0aa3968 100644 --- a/contriborbase +++ b/contriborbase @@ -1 +1 @@ -contribs10 +contribs11 diff --git a/root/usr/share/doc/smeserver-smeadmin/create-mysql.sh b/root/usr/share/doc/smeserver-smeadmin/create-mysql.sh index 62480ee..96359ee 100755 --- a/root/usr/share/doc/smeserver-smeadmin/create-mysql.sh +++ b/root/usr/share/doc/smeserver-smeadmin/create-mysql.sh @@ -9,7 +9,7 @@ #----------------------------------- #database creation -mysqladmin create smeadmin 2>err +mariadb-admin create smeadmin 2>err if [ $? -ne 0 ] then echo -n "Error in the creation of the database : " @@ -21,9 +21,7 @@ fi PASS=$(/sbin/e-smith/db configuration getprop smeadmind DbPassword) #user creation -mysql -e " grant all privileges on smeadmin.* \ - to 'smeadmin'@'localhost' \ - identified by '$PASS' " 2>err +mariadb -e " create user smeadmin@localhost identified by '$PASS' " 2>err if [ $? -ne 0 ] then @@ -33,8 +31,20 @@ else echo -e "Creation of mysql user :\t\t[OK]" fi +mariadb -e " grant all privileges on smeadmin.* \ + to 'smeadmin'@'localhost' \ + identified by '$PASS' " 2>err + +if [ $? -ne 0 ] +then + echo -n "Error in the permissions grant to mysql user : " + cat err +else + echo -e "Permissions grant to mysql user :\t\t[OK]" +fi + #table creation -mysql smeadmin < /usr/share/doc/smeserver-smeadmin/tables.sql 2>err +mariadb smeadmin < /usr/share/doc/smeserver-smeadmin/tables.sql 2>err if [ $? -ne 0 ] then echo -n "Error in the creation of the tables : " @@ -46,4 +56,4 @@ fi rm -f err #validation des modifications -mysqladmin flush-privileges +mariadb-admin flush-privileges diff --git a/smeserver-smeadmin.spec b/smeserver-smeadmin.spec index 6d538eb..fa35fb4 100644 --- a/smeserver-smeadmin.spec +++ b/smeserver-smeadmin.spec @@ -7,7 +7,7 @@ Summary: A graphical monitor, alert raising, and services supervision tool for y %define name smeserver-smeadmin Name: %{name} %define version 1.6 -%define release 17 +%define release 18 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %changelog +* Thu Oct 23 2025 Vasarhelyi Zsolt 1.6-18.sme +- Fix database creation script [SME: 12961] + * Wed Oct 08 2025 Brian Read 1.6-17.sme - Apply change from startform to start_form and endform to end_form to CGI panels [SME: 12787] - fix .gitignore and delete tarball from git repo [SME: 12787]