baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2025-02-17 12:06:40 +00:00
Code Issues Actions Packages Releases Activity

Compare commits

base: baoshuo:67c29e3addf8a7718200510506d2f6d3c8024787
Branches Tags
baoshuo:master
baoshuo:s2oj-gcc
baoshuo:limits-in-extra-config
baoshuo:develop
baoshuo:legacy
baoshuo:v1.0
...
compare: baoshuo:e77fe16199b2ea8c7d1201c337afa7d9adb57df2
Branches Tags
baoshuo:master
baoshuo:s2oj-gcc
baoshuo:limits-in-extra-config
baoshuo:develop
baoshuo:legacy
baoshuo:v1.0

2 Commits
67c29e3add ... e77fe16199

Author SHA1 Message Date
Baoshuo
e77fe16199
chore: add uoj_protocol config
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-09-20 13:50:29 +08:00
Baoshuo
3de083701d
fix: randStr length 2022-09-20 13:20:51 +08:00
3 changed files with 5 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
docker-compose.development.yml
View File

@ -51,6 +51,7 @@ services:
ports: ports:
- "80:80" - "80:80"
environment: environment:
- UOJ_PROTOCOL=http
- DATABASE_HOST=uoj-db - DATABASE_HOST=uoj-db
- DATABASE_PASSWORD=root - DATABASE_PASSWORD=root
- JUDGER_SOCKET_PORT=2333 - JUDGER_SOCKET_PORT=2333

1
docker-compose.yml
View File

@ -46,6 +46,7 @@ services:
ports: ports:
- "80:80" - "80:80"
environment: environment:
- UOJ_PROTOCOL=https
- DATABASE_HOST=uoj-db - DATABASE_HOST=uoj-db
- DATABASE_PASSWORD=root - DATABASE_PASSWORD=root
- JUDGER_SOCKET_PORT=2333 - JUDGER_SOCKET_PORT=2333

4
web/install.sh
View File

@ -8,9 +8,10 @@ _database_password_="${DATABASE_PASSWORD:-root}"
_judger_socket_port_="${JUDGER_SOCKET_PORT:-2333}" _judger_socket_port_="${JUDGER_SOCKET_PORT:-2333}"
_judger_socket_password_="${JUDGER_SOCKET_PASSWORD:-_judger_socket_password_}" _judger_socket_password_="${JUDGER_SOCKET_PASSWORD:-_judger_socket_password_}"
_salt0_="${SALT0:-$(genRandStr 32)}" _salt0_="${SALT0:-$(genRandStr 32)}"
_salt1_="${SALT1:-$(genRandStr 32)}" _salt1_="${SALT1:-$(genRandStr 16)}"
_salt2_="${SALT2:-$(genRandStr 16)}" _salt2_="${SALT2:-$(genRandStr 16)}"
_salt3_="${SALT3:-$(genRandStr 16)}" _salt3_="${SALT3:-$(genRandStr 16)}"
_uoj_protocol_="${UOJ_PROTOCOL:-http}"
getAptPackage(){ getAptPackage(){
printf "\n\n==> Getting environment packages\n" printf "\n\n==> Getting environment packages\n"
@ -86,6 +87,7 @@ initProgress(){
chown -R www-data:www-data /var/uoj_data chown -R www-data:www-data /var/uoj_data
#Replace password placeholders #Replace password placeholders
sed -i -e "s/salt0/$_salt0_/g" -e "s/salt1/$_salt1_/g" -e "s/salt2/$_salt2_/g" -e "s/salt3/$_salt3_/g" -e "s/_judger_socket_password_/$_judger_socket_password_/g" /var/www/uoj/app/.config.php sed -i -e "s/salt0/$_salt0_/g" -e "s/salt1/$_salt1_/g" -e "s/salt2/$_salt2_/g" -e "s/salt3/$_salt3_/g" -e "s/_judger_socket_password_/$_judger_socket_password_/g" /var/www/uoj/app/.config.php
sed -i -e "s/'protocol' => 'http'/'protocol' => '$_uoj_protocol_',/g" /var/www/uoj/app/.config.php
#Using cli upgrade to latest #Using cli upgrade to latest
php /var/www/uoj/app/cli.php upgrade:latest php /var/www/uoj/app/cli.php upgrade:latest
#Start services #Start services