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

fix: fix the wrong svn password (#9)

Browse Source 
Due to historical reasons,the password for problem will be refresh by the web side after it created.So the svn password should use only one. And the last hotfix caused some strange problem. Fix it.
This commit is contained in:
Igronemyk 2018-01-01 17:14:15 +08:00 committed by ceba
parent 349f8471e1
commit bea9508a26
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
install/bundle/install.sh
View File

@ -7,7 +7,6 @@ _database_password_=root
_judger_socket_port_=2333 _judger_socket_port_=2333
_judger_socket_password_=$(genRandStr 10) _judger_socket_password_=$(genRandStr 10)
_main_judger_password_=$(genRandStr 32) _main_judger_password_=$(genRandStr 32)
_svn_ourroot_password_=$(genRandStr 10)
_svn_certroot_password_=$(genRandStr 32) _svn_certroot_password_=$(genRandStr 32)
getAptPackage(){ getAptPackage(){
@ -112,7 +111,7 @@ password-db = passwd
EOD EOD
svnusr="our-root" svnusr="our-root"
svnpwd="$_svn_ourroot_password_" svnpwd="$_svn_certroot_password_"
cat >\$path/conf/passwd <<EOD cat >\$path/conf/passwd <<EOD
[users] [users]
@ -133,7 +132,7 @@ UOJEOF
cat >/var/svn/problem/post-commit.sh <<UOJEOF cat >/var/svn/problem/post-commit.sh <<UOJEOF
#!/bin/sh #!/bin/sh
svnusr="our-root" svnusr="our-root"
svnpwd="$_svn_ourroot_password_" svnpwd="$_svn_certroot_password_"
cd /var/svn/problem/\$1/cur/\$1 cd /var/svn/problem/\$1/cur/\$1
svn update --username \$svnusr --password \$svnpwd svn update --username \$svnusr --password \$svnpwd
chown www-data /var/svn/problem/\$1 -R chown www-data /var/svn/problem/\$1 -R
@ -149,7 +148,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