diff --git a/compose/README.md b/compose/README.md index e9a04f3e..a084119e 100644 --- a/compose/README.md +++ b/compose/README.md @@ -16,6 +16,7 @@ docker-compose logs -f --tail=50 edumeet Accessing endpoints: -- Edumeet: https://127.0.0.1:8443/ +- Edumeet (app live dev): https://127.0.0.1:8443/ +- Edumeet (app build): https://127.0.0.1:3443/ - Prometheus: http://127.0.0.1:9090/ - Grafana: http://127.0.0.1:9091/ (user:pass `admin`:`admin`) diff --git a/compose/config/edumeet-server-config.js b/compose/config/edumeet-server-config.js index a7bbbf3f..841e6d46 100644 --- a/compose/config/edumeet-server-config.js +++ b/compose/config/edumeet-server-config.js @@ -171,11 +171,11 @@ module.exports = listeningPort : 3443, // Any http request is redirected to https. // Listening port for http server. - //listeningRedirectPort : 8080, + listeningRedirectPort : 8080, // Listens only on http, only on listeningPort // listeningRedirectPort disabled // use case: loadbalancer backend - httpOnly : true, + httpOnly : false, // WebServer/Express trust proxy config for httpOnly mode // You can find more info: // - https://expressjs.com/en/guide/behind-proxies.html diff --git a/compose/config/nginx.conf b/compose/config/nginx.conf index b85fe910..0ca5ddf5 100644 --- a/compose/config/nginx.conf +++ b/compose/config/nginx.conf @@ -16,7 +16,7 @@ server { # server location ~ ^/(socket\.io) { - proxy_pass http://edumeet:3443; + proxy_pass https://edumeet:3443; # proxy_http_version 1.1; proxy_redirect off; diff --git a/compose/edumeet/Dockerfile b/compose/edumeet/Dockerfile index 6d324e6a..656472c9 100644 --- a/compose/edumeet/Dockerfile +++ b/compose/edumeet/Dockerfile @@ -6,4 +6,5 @@ WORKDIR /edumeet ENV DEBUG=edumeet*,mediasoup* RUN npm install -g nodemon && \ npm install -g concurrently +CMD cd app && yarn && yarn build CMD concurrently --names "server,app" "cd server && yarn && nodemon server.js" "cd app && yarn && yarn start" \ No newline at end of file