From 15f960c6f04b9e05b54f08b94165f645d374f3c2 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 22 Feb 2018 13:19:27 +0100 Subject: [PATCH] Nginx timesout to 600s --- docker-compose.yml | 2 +- etc/{apt.list => apt/sources.list} | 0 etc/{nginx.conf => nginx/conf.d/default.conf} | 11 ++++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) rename etc/{apt.list => apt/sources.list} (100%) rename etc/{nginx.conf => nginx/conf.d/default.conf} (82%) diff --git a/docker-compose.yml b/docker-compose.yml index dfd8c83e..47d88e97 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -81,7 +81,7 @@ nginx: ports: - "8000:80" volumes: - - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf + - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf volumes_from: - data links: diff --git a/etc/apt.list b/etc/apt/sources.list similarity index 100% rename from etc/apt.list rename to etc/apt/sources.list diff --git a/etc/nginx.conf b/etc/nginx/conf.d/default.conf similarity index 82% rename from etc/nginx.conf rename to etc/nginx/conf.d/default.conf index a5649942..5f79aa64 100644 --- a/etc/nginx.conf +++ b/etc/nginx/conf.d/default.conf @@ -16,14 +16,14 @@ server { alias /srv/media; # your Django project's media files - amend as required # Django media export location /media/export { - internal; # protect media files directory only accessible through Django + internal; # protect media files directory only accessible through Django alias /srv/media/export; } # Django media items location /media/items { - internal; # protect media files directory only accessible through Django + internal; # protect media files directory only accessible through Django alias /srv/media/items; - } + } } @@ -45,5 +45,10 @@ server { location / { uwsgi_pass app:8000; include /etc/nginx/uwsgi_params; + uwsgi_read_timeout 600; + proxy_set_header Host $http_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; } } -- 2.39.5