cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-25 02:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update nginx.conf (#808)

Browse Source 
* Update nginx.conf

* Update .editorconfig

* Update .editorconfig

* Update nginx.conf

* Update .editorconfig

* Update .editorconfig
This commit is contained in:
Delio Castillo 2016-09-20 14:22:47 -07:00 committed by Jannis Gebauer
parent bb913b7507
commit a4884bb5d7
3 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.editorconfig
View File

@ -21,3 +21,7 @@ trim_trailing_whitespace = false
[Makefile] [Makefile]
indent_style = tab indent_style = tab
[nginx.conf]
indent_style = space
indent_size = 2

4
{{cookiecutter.project_slug}}/.editorconfig
View File

@ -27,3 +27,7 @@ trim_trailing_whitespace = false
[Makefile] [Makefile]
indent_style = tab indent_style = tab
[nginx.conf]
indent_style = space
indent_size = 2

9
{{cookiecutter.project_slug}}/compose/nginx/nginx.conf
View File

@ -4,13 +4,11 @@ worker_processes 1;
error_log /var/log/nginx/error.log warn; error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid; pid /var/run/nginx.pid;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
default_type application/octet-stream; default_type application/octet-stream;
@ -44,7 +42,6 @@ http {
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Proto https; proxy_set_header X-Forwarded-Proto https;
} }
{% endif %} {% endif %}
location / { location / {
@ -52,19 +49,13 @@ http {
try_files $uri @proxy_to_app; try_files $uri @proxy_to_app;
} }
# cookiecutter-django app # cookiecutter-django app
location @proxy_to_app { location @proxy_to_app {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_redirect off; proxy_redirect off;
proxy_pass http://app; proxy_pass http://app;
} }
} }
} }