From 87d16869ce04916fc77d839c28cd75cc5e1dcf3b Mon Sep 17 00:00:00 2001 From: Bogomil Vasilev Date: Sat, 3 Sep 2016 22:50:43 +0300 Subject: [PATCH] Cleanups in the sql scripts --- db_scripts/init_rmps_db.sh | 2 +- db_scripts/init_rmps_db.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db_scripts/init_rmps_db.sh b/db_scripts/init_rmps_db.sh index 74773a2..fd76c20 100755 --- a/db_scripts/init_rmps_db.sh +++ b/db_scripts/init_rmps_db.sh @@ -17,7 +17,7 @@ pass_hash=`printf ${newuser_pass}${salt}|sha512sum|head -c 128` #printf "\nSalt = $salt" #printf "\nHash = $pass_hash\n" -mysql -u rmps --password="$dbpass" -e "set @loginName=\"$adminpass\";\ +mysql -u rmps --password="$dbpass" -e "\ set @loginName=\"$username\";\ set @fullName=\"$fullname\";\ set @eMail=\"$email\";\ diff --git a/db_scripts/init_rmps_db.sql b/db_scripts/init_rmps_db.sql index 523307f..3f98adb 100644 --- a/db_scripts/init_rmps_db.sql +++ b/db_scripts/init_rmps_db.sql @@ -114,8 +114,6 @@ INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Detect OS'); INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Detect UNIX kernel'); INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Get memory status'); -/* Setup the admin user */ - /* Define the procedures */ DELIMITER $$ @@ -154,6 +152,8 @@ BEGIN SET output = 1; END IF; END $$ + +/* Setup the admin user */ call addUser(@loginName, @fullName, @eMail, @passHash, @passSalt, 0, @output); DROP PROCEDURE IF EXISTS `rmps`.`deactivateUser` $$