baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-22 03:08:41 +00:00
Code Issues Actions Packages Releases Activity

fix(install/bundle): fix the wrong generation of our-root password and length

Browse Source 
The last commit changed the installation script a lot, but made some mistakes on the genration of config.
It gens the $_svn_ourroot_password_ to $_svn_certroot_password_. Just fix it.
According to the version from @vfleaking, the judger_socket password and the our-root password is 32 chars long. Strengthen it.
There is also a *** space char on the end of a line. Kick it out.
This commit is contained in:
Masco Skray 2018-04-15 10:58:57 +08:00
parent a1b372dd31
commit 2d0b0814fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install/bundle/install.sh
View File

@ -5,9 +5,9 @@ genRandStr(){
#Set some vars #Set some vars
_database_password_=root _database_password_=root
_judger_socket_port_=2333 _judger_socket_port_=2333
_judger_socket_password_=$(genRandStr 10) _judger_socket_password_=$(genRandStr 32)
_main_judger_password_=$(genRandStr 32) _main_judger_password_=$(genRandStr 32)
_svn_ourroot_password_=$(genRandStr 10) _svn_ourroot_password_=$(genRandStr 32)
_svn_certroot_password_=$(genRandStr 32) _svn_certroot_password_=$(genRandStr 32)
getAptPackage(){ getAptPackage(){
@ -149,7 +149,7 @@ UOJEOF
setWebConf(){ setWebConf(){
echo -e "\n\n==> Setting web files" echo -e "\n\n==> Setting web files"
#Commit web source file #Commit web source file
svn co svn://127.0.0.1/uoj --username root --password $_svn_certroot_password_ svn co svn://127.0.0.1/uoj --username root --password $_svn_certroot_password_
mv ../../uoj/1 uoj/1 && cd uoj mv ../../uoj/1 uoj/1 && cd uoj
svn add 1 && svn ci -m "Installtion commit" --username root --password $_svn_certroot_password_ svn add 1 && svn ci -m "Installtion commit" --username root --password $_svn_certroot_password_
cd .. && rm uoj /var/www/uoj -r cd .. && rm uoj /var/www/uoj -r
@ -164,7 +164,7 @@ setWebConf(){
\$config['security']['cookie']['checksum_salt']=['$(genRandStr 16)','$(genRandStr 16)','$(genRandStr 16)']; \$config['security']['cookie']['checksum_salt']=['$(genRandStr 16)','$(genRandStr 16)','$(genRandStr 16)'];
\$config['judger']['socket']['port']='$_judger_socket_port_'; \$config['judger']['socket']['port']='$_judger_socket_port_';
\$config['judger']['socket']['password']='$_judger_socket_password_'; \$config['judger']['socket']['password']='$_judger_socket_password_';
\$config['svn']['our-root']['password']='$_svn_certroot_password_'; \$config['svn']['our-root']['password']='$_svn_ourroot_password_';
file_put_contents('/var/www/uoj/app/.config.php', "<?php\nreturn ".str_replace('\'_httpHost_\'','UOJContext::httpHost()',var_export(\$config, true)).";\n"); file_put_contents('/var/www/uoj/app/.config.php', "<?php\nreturn ".str_replace('\'_httpHost_\'','UOJContext::httpHost()',var_export(\$config, true)).";\n");
UOJEOF UOJEOF
#Import MySQL database #Import MySQL database