smirky/rmps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups in the sql scripts

Browse Source
This commit is contained in:
Bogomil Vasilev
2016-09-03 22:50:43 +03:00
parent 03d4a4d662
commit 87d16869ce
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db_scripts/init_rmps_db.sh
View File

@@ -17,7 +17,7 @@ pass_hash=`printf ${newuser_pass}${salt}|sha512sum|head -c 128`
#printf "\nSalt = $salt" #printf "\nSalt = $salt"
#printf "\nHash = $pass_hash\n" #printf "\nHash = $pass_hash\n"
mysql -u rmps --password="$dbpass" -e "set @loginName=\"$adminpass\";\ mysql -u rmps --password="$dbpass" -e "\
set @loginName=\"$username\";\ set @loginName=\"$username\";\
set @fullName=\"$fullname\";\ set @fullName=\"$fullname\";\
set @eMail=\"$email\";\ set @eMail=\"$email\";\

4
db_scripts/init_rmps_db.sql
View File

@@ -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 ('Detect UNIX kernel');
INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Get memory status'); INSERT INTO `rmps`.`job_types` (`descr`) VALUES ('Get memory status');
/* Setup the admin user */
/* Define the procedures */ /* Define the procedures */
DELIMITER $$ DELIMITER $$
@@ -154,6 +152,8 @@ BEGIN
SET output = 1; SET output = 1;
END IF; END IF;
END $$ END $$
/* Setup the admin user */
call addUser(@loginName, @fullName, @eMail, @passHash, @passSalt, 0, @output); call addUser(@loginName, @fullName, @eMail, @passHash, @passSalt, 0, @output);
DROP PROCEDURE IF EXISTS `rmps`.`deactivateUser` $$ DROP PROCEDURE IF EXISTS `rmps`.`deactivateUser` $$