diff --git a/docker-compose.yaml b/docker-compose.yaml index 0c536df..1e85fec 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,11 +8,19 @@ services: ports: - "3000:443" volumes: - - ./proxy/ssl:/etc/nginx/ssl:ro + # reusing the ssl files from the backend + - ./traque-back/ssl:/etc/nginx/ssl:ro restart: always back: build: ./traque-back ports: - "3001:3001" - restart: always \ No newline at end of file + restart: always + environment: + ADMIN_PASSWORD: 'traquebdsbanger' + HOST: '0.0.0.0' + PORT: 3001 + #Those files need to exist in traque-back/ssl for https to work + SSL_KEY: "ssl/privkey.pem" + SSL_CERT: "ssl/cert.pem" \ No newline at end of file diff --git a/proxy/.gitignore b/proxy/.gitignore deleted file mode 100644 index f7314e8..0000000 --- a/proxy/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ssl/ \ No newline at end of file diff --git a/traque-back/.gitignore b/traque-back/.gitignore index 800f3e6..a4396bf 100644 --- a/traque-back/.gitignore +++ b/traque-back/.gitignore @@ -1,3 +1,4 @@ +ssl/* uploads/* #https dev certificates *.pem diff --git a/traque-back/Dockerfile b/traque-back/Dockerfile index 37202fe..762ad6d 100644 --- a/traque-back/Dockerfile +++ b/traque-back/Dockerfile @@ -14,7 +14,7 @@ RUN npm install COPY . . # Expose application port -EXPOSE 3000 +EXPOSE 3001 # Start the application CMD npm start diff --git a/traque-back/readme.md b/traque-back/readme.md index f44d9df..8184a93 100644 --- a/traque-back/readme.md +++ b/traque-back/readme.md @@ -3,8 +3,8 @@ ADMIN_PASSWORD = 'admin password here' HOST = 'traque.rezel.net' PORT = 3001 -SSL_KEY = "../proxy/ssl/privkey.pem" -SSL_CERT = "../proxy/ssl/cert.pem" +SSL_KEY = "ssl/privkey.pem" +SSL_CERT = "ssl/cert.pem" ``` # Run dev version First install the dependencies