diff --git a/2024-04-08-Note-11-05.xopp b/2024-04-08-Note-11-05.xopp deleted file mode 100644 index 3583cae..0000000 Binary files a/2024-04-08-Note-11-05.xopp and /dev/null differ diff --git a/docker-compose.yaml b/docker-compose.yaml index 1662c82..0c536df 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,7 +8,7 @@ services: ports: - "3000:443" volumes: - - ./traque-back/ssl:/etc/nginx/ssl:ro + - ./proxy/ssl:/etc/nginx/ssl:ro restart: always back: diff --git a/proxy/.gitignore b/proxy/.gitignore new file mode 100644 index 0000000..f7314e8 --- /dev/null +++ b/proxy/.gitignore @@ -0,0 +1 @@ +ssl/ \ No newline at end of file diff --git a/readme.md b/readme.md index b94b132..dfab33d 100644 --- a/readme.md +++ b/readme.md @@ -16,9 +16,8 @@ SSL_KEY = "/path/to/privkey.pem" SSL_CERT = "/path/to/cert.pem" ADMIN_PASSWORD = 'admin_password_here' MAX_PENALTIES = 3 -ALLOWED_TIME_OUT_OF_ZONE_IN_MINUTES = 10 -ALLOWED_TIME_BETWEEN_POSITION_UPDATE_IN_MINUTES = 10 ``` + Where ADMIN_PASSWORD is the password for the admin user, HOST is the host of the server, PORT is the port of the server, SSL_KEY is the path to the key file and SSL_CERT is the path to the certificate file. The SSL_KEY and SSL_CERT are used for HTTPS and are required for the server to work. This is because the browser will block the GeoLocation API if the connection is not secure. MAX_PENALTIES is the maximum number of penalties a user can have before loosing the game. @@ -47,5 +46,5 @@ https://example.com:3000 ``` ## Deployment -Put your certificate and private key in the traque-back/ssl folder. They need to be named `cert.pem` and `privkey.pem`. +Put your certificate and private key in the proxy/ssl folder. They need to be named `cert.pem` and `privkey.pem`. You can then depploy the docker application with `docker compose up` diff --git a/traque-back/readme.md b/traque-back/readme.md index 99088bd..086c451 100644 --- a/traque-back/readme.md +++ b/traque-back/readme.md @@ -5,6 +5,4 @@ HOST = '10.192.64.61' PORT = 3001 SSL_KEY = "key.pem" SSL_CERT = "server.crt" -ALLOWED_TIME_OUT_OF_ZONE_IN_MINUTES = 0.1 -ALLOWED_TIME_BETWEEN_POSITION_UPDATE_IN_MINUTES = 1 ``` \ No newline at end of file diff --git a/traque-back/uploads/.gitignore b/traque-back/uploads/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/traque-back/uploads/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file