diff --git a/docker-compose.yml b/docker-compose.yml index a5d2927..5068f43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: - "80:80" volumes: - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro + - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro depends_on: - backend diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf index 4f77caf..bbcec6e 100644 --- a/docker/nginx/conf.d/default.conf +++ b/docker/nginx/conf.d/default.conf @@ -1,16 +1,16 @@ server { - listen 80; - server_name localhost; - - root /usr/share/nginx/html; - index index.html; + listen 80; + server_name localhost; + + root /usr/share/nginx/html; + index index.html; location / { try_files $uri $uri/ /index.html; expires -1; add_header Cache-Control "no-store, no-cache, must-revalidate"; } - + location /api/ { proxy_pass http://backend:8000/api/; proxy_http_version 1.1; @@ -22,7 +22,4 @@ server { proxy_send_timeout 60s; proxy_read_timeout 60s; } - - access_log /var/log/nginx/access.log; - error_log /var/log/nginx/error.log; } \ No newline at end of file diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index ccb4a3c..f7c3d99 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -1,47 +1,25 @@ -user nginx; -worker_processes auto; -error_log /var/log/nginx/error.log notice; -pid /var/run/nginx.pid; +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; events { - worker_connections 1024; + worker_connections 1024; } http { - include /etc/nginx/mime.types; - default_type application/octet-stream; + include /etc/nginx/mime.types; + default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - keepalive_timeout 65; + access_log /var/log/nginx/access.log main; - server { - listen 80; - server_name localhost; - - root /usr/share/nginx/html; - index index.html; + sendfile on; + keepalive_timeout 65; - location / { - try_files $uri $uri/ /index.html; - expires -1; - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - - location /api/ { - proxy_pass http://backend:8000/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; - proxy_connect_timeout 60s; - proxy_send_timeout 60s; - proxy_read_timeout 60s; - } - } + include /etc/nginx/conf.d/*.conf; } \ No newline at end of file