diff --git a/ansible/roles/4-nginx/templates/nginx_note.conf b/ansible/roles/4-nginx/templates/nginx_note.conf index 9be2d980..b195e739 100644 --- a/ansible/roles/4-nginx/templates/nginx_note.conf +++ b/ansible/roles/4-nginx/templates/nginx_note.conf @@ -53,7 +53,7 @@ server { # Finally, send all non-media requests to the Django server. location / { uwsgi_pass note; - include /var/www/note_kfet/uwsgi_params; # the uwsgi_params file you installed + include /etc/nginx/uwsgi_params; } ssl_certificate /etc/letsencrypt/live/nk20-beta.crans.org/fullchain.pem; diff --git a/nginx_note.conf_docker b/nginx_note.conf_docker deleted file mode 100644 index 020fe204..00000000 --- a/nginx_note.conf_docker +++ /dev/null @@ -1,27 +0,0 @@ -# This is an example NGINX site configuration for note_kfet in Docker -# Only HTTP, please use a reverse proxy to secure it! - -server { - # Serve this site by default on HTTP - listen 80 default_server; - listen [::]:80 default_server; - - # Max upload size - client_max_body_size 75M; - - # Django statics and media - location /static { - alias /code/static; - } - location /media { - alias /code/media; - } - - # Send all non-media requests to the Django server. - location / { - proxy_pass http://127.0.0.1:8000; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - proxy_redirect off; - } -} diff --git a/uwsgi_params b/uwsgi_params deleted file mode 100644 index 827deedb..00000000 --- a/uwsgi_params +++ /dev/null @@ -1,26 +0,0 @@ - -uwsgi_param QUERY_STRING $query_string; -uwsgi_param REQUEST_METHOD $request_method; -uwsgi_param CONTENT_TYPE $content_type; -uwsgi_param CONTENT_LENGTH $content_length; - -uwsgi_param REQUEST_URI $request_uri; -uwsgi_param PATH_INFO $document_uri; -uwsgi_param DOCUMENT_ROOT $document_root; -uwsgi_param SERVER_PROTOCOL $server_protocol; -uwsgi_param REQUEST_SCHEME $scheme; -uwsgi_param HTTPS $https if_not_empty; - -uwsgi_param REMOTE_ADDR $remote_addr; -uwsgi_param REMOTE_PORT $remote_port; -uwsgi_param SERVER_PORT $server_port; -uwsgi_param SERVER_NAME $server_name; - - - - - - - - -