docker-compose.development.yml

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

docker-compose.yml

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

web/install.sh

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