smecontribs/smeserver-smeadmin
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix database creation script [SME: 12961]

Browse Source
This commit is contained in:
Zsolt Vasarhelyi
2025-10-23 16:38:42 +03:00
parent c90b1683f2
commit b3d12732d3
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contriborbase
View File

@@ -1 +1 @@
contribs10 contribs11

22
root/usr/share/doc/smeserver-smeadmin/create-mysql.sh
View File

@@ -9,7 +9,7 @@
#----------------------------------- #-----------------------------------
#database creation #database creation
mysqladmin create smeadmin 2>err mariadb-admin create smeadmin 2>err
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
echo -n "Error in the creation of the database : " echo -n "Error in the creation of the database : "
@@ -21,9 +21,7 @@ fi
PASS=$(/sbin/e-smith/db configuration getprop smeadmind DbPassword) PASS=$(/sbin/e-smith/db configuration getprop smeadmind DbPassword)
#user creation #user creation
mysql -e " grant all privileges on smeadmin.* \ mariadb -e " create user smeadmin@localhost identified by '$PASS' " 2>err
to 'smeadmin'@'localhost' \
identified by '$PASS' " 2>err
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
@@ -33,8 +31,20 @@ else
echo -e "Creation of mysql user :\t\t[OK]" echo -e "Creation of mysql user :\t\t[OK]"
fi 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 #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 ] if [ $? -ne 0 ]
then then
echo -n "Error in the creation of the tables : " echo -n "Error in the creation of the tables : "
@@ -46,4 +56,4 @@ fi
rm -f err rm -f err
#validation des modifications #validation des modifications
mysqladmin flush-privileges mariadb-admin flush-privileges

5
smeserver-smeadmin.spec
View File

@@ -7,7 +7,7 @@ Summary: A graphical monitor, alert raising, and services supervision tool for y
%define name smeserver-smeadmin %define name smeserver-smeadmin
Name: %{name} Name: %{name}
%define version 1.6 %define version 1.6
%define release 17 %define release 18
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Thu Oct 23 2025 Vasarhelyi Zsolt <zsoltv@koozali.org> 1.6-18.sme
- Fix database creation script [SME: 12961]
* Wed Oct 08 2025 Brian Read <brianr@koozali.org> 1.6-17.sme * Wed Oct 08 2025 Brian Read <brianr@koozali.org> 1.6-17.sme
- Apply change from startform to start_form and endform to end_form to CGI panels [SME: 12787] - 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] - fix .gitignore and delete tarball from git repo [SME: 12787]