diff --git a/MUOR/MUOR/configs/muor.conf b/MUOR/MUOR/configs/muor.conf index b8b44a248..6f40c59c8 100644 --- a/MUOR/MUOR/configs/muor.conf +++ b/MUOR/MUOR/configs/muor.conf @@ -50,8 +50,11 @@ server { # Finally, send all non-media requests to the Django server. location / { if ($cookie_sessionid = ""){ - proxy_pass http://django; # TODO prolly change that to uwsgi_pass +# proxy_pass http://django; # TODO prolly change that to uwsgi_pass + include /etc/nginx/uwsgi_params; + uwsgi_pass django; } + } ssl_certificate /etc/letsencrypt/live/randomsec.projektstudencki.pl/fullchain.pem; # managed by Certbot diff --git a/MUOR/MUOR/configs/muor_after_location_block.conf b/MUOR/MUOR/configs/muor_after_location_block.conf index c8deb2663..2855f66be 100644 --- a/MUOR/MUOR/configs/muor_after_location_block.conf +++ b/MUOR/MUOR/configs/muor_after_location_block.conf @@ -1,6 +1,8 @@ if ($cookie_sessionid = ""){ - proxy_pass http://django; # TODO prolly change that to uwsgi_pass +# proxy_pass http://django; # TODO prolly change that to uwsgi_pass + include /etc/nginx/uwsgi_params; + uwsgi_pass django; } } diff --git a/MUOR/MUOR/configs/uwsgi.ini b/MUOR/MUOR/configs/uwsgi.ini index 451d497e7..19cc9f870 100644 --- a/MUOR/MUOR/configs/uwsgi.ini +++ b/MUOR/MUOR/configs/uwsgi.ini @@ -1,8 +1,13 @@ [uwsgi] -chdir=/home/randomsec/RandomSec/MUOR -module=MUOR.wsgi:application +chdir=/home/randomsec/RandomSec/MUOR/MUOR +module=MUOR.wsgi master=True -pidfile=/home/randomsec/project-master.pid +pidfile=/home/randomsec/uwsgi-file/project-master.pid vacuum=True max-requests=5000 -daemonize=/home/randomsec/RandomSec/log/logs.log \ No newline at end of file +daemonize=/home/randomsec/RandomSec/log/logs.log +socket=0.0.0.0:8080 +buffer-size=32768 +plugins = python3 + + diff --git a/MUOR/requirements.txt b/MUOR/requirements.txt index 626cf2b62..da14598fc 100644 --- a/MUOR/requirements.txt +++ b/MUOR/requirements.txt @@ -1,6 +1,7 @@ Django django-crispy-forms docker +uwsgi celery redis django-redis