diff --git a/docker/.gitignore b/docker/.gitignore index 9b501e10d..1e35b3731 100755 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -7,5 +7,6 @@ dist/mongo/data/* dist/redis/data/* prod/mongo/data/* prod/redis/data/* +dist/docker-compose-test.yaml *.env prod/certbot/* \ No newline at end of file diff --git a/docker/dist/docker-compose.yaml b/docker/dist/docker-compose.yaml index 0f2b603ed..230623c8d 100755 --- a/docker/dist/docker-compose.yaml +++ b/docker/dist/docker-compose.yaml @@ -21,7 +21,6 @@ services: - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db?replicaSet=rs0 - REDIS_URL=redis://redis:6379 - CLIENT_HOST=http://localhost - - JWT_SECRET=my_secret # volumes: # - /var/run/docker.sock:/var/run/docker.sock:ro redis: diff --git a/docker/dist/nginx/conf.d/default.conf b/docker/dist/nginx/conf.d/default.conf index 0592dcd06..30e51c71c 100755 --- a/docker/dist/nginx/conf.d/default.conf +++ b/docker/dist/nginx/conf.d/default.conf @@ -15,14 +15,14 @@ server { try_files $uri $uri/ /index.html; } - location /api/ { - proxy_pass http://server:5000/api/; - proxy_http_version 1.1; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } + # location /api/ { + # proxy_pass http://server:5000/api/; + # proxy_http_version 1.1; + # proxy_set_header Host $host; + # proxy_set_header X-Real-IP $remote_addr; + # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # proxy_set_header X-Forwarded-Proto $scheme; + # } location /api-docs/ { proxy_pass http://server:5000/api-docs/;