diff --git a/.editorconfig b/.editorconfig index 585e2abc..26140706 100644 --- a/.editorconfig +++ b/.editorconfig @@ -21,3 +21,7 @@ trim_trailing_whitespace = false [Makefile] indent_style = tab + +[nginx.conf] +indent_style = space +indent_size = 2 diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig index 9759b2ca..b19266bf 100644 --- a/{{cookiecutter.project_slug}}/.editorconfig +++ b/{{cookiecutter.project_slug}}/.editorconfig @@ -27,3 +27,7 @@ trim_trailing_whitespace = false [Makefile] indent_style = tab + +[nginx.conf] +indent_style = space +indent_size = 2 diff --git a/{{cookiecutter.project_slug}}/compose/nginx/nginx.conf b/{{cookiecutter.project_slug}}/compose/nginx/nginx.conf index 5d7faa39..9573effe 100644 --- a/{{cookiecutter.project_slug}}/compose/nginx/nginx.conf +++ b/{{cookiecutter.project_slug}}/compose/nginx/nginx.conf @@ -4,67 +4,58 @@ worker_processes 1; error_log /var/log/nginx/error.log warn; 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; - access_log /var/log/nginx/access.log main; + sendfile on; + #tcp_nopush on; - sendfile on; - #tcp_nopush on; + keepalive_timeout 65; - keepalive_timeout 65; + #gzip on; - #gzip on; + upstream app { + server django:5000; + } - upstream app { - server django:5000; + server { + listen 80; + charset utf-8; + + {% if cookiecutter.use_lets_encrypt == 'y' and cookiecutter.use_docker == 'y' %} + server_name ___my.example.com___ ; + + location /.well-known/acme-challenge { + proxy_pass http://certbot:80; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto https; + } + {% endif %} + + location / { + # checks for static file, if not found proxy to app + try_files $uri @proxy_to_app; } - server { - listen 80; - charset utf-8; + # cookiecutter-django app + location @proxy_to_app { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_pass http://app; - {% if cookiecutter.use_lets_encrypt == 'y' and cookiecutter.use_docker == 'y' %} - server_name ___my.example.com___ ; - - location /.well-known/acme-challenge { - proxy_pass http://certbot:80; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto https; - } - - {% endif %} - - location / { - # checks for static file, if not found proxy to app - try_files $uri @proxy_to_app; - } - - - # cookiecutter-django app - location @proxy_to_app { - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_redirect off; - - proxy_pass http://app; - - } - } + } + } } - - - -