Merge remote-tracking branch 'origin/master'

This commit is contained in:
prance 2022-01-30 16:45:39 +01:00
commit b4e184c4d7
4 changed files with 17 additions and 6 deletions

View File

@ -50,8 +50,11 @@ server {
# Finally, send all non-media requests to the Django server. # Finally, send all non-media requests to the Django server.
location / { location / {
if ($cookie_sessionid = ""){ 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 ssl_certificate /etc/letsencrypt/live/randomsec.projektstudencki.pl/fullchain.pem; # managed by Certbot

View File

@ -1,6 +1,8 @@
if ($cookie_sessionid = ""){ 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;
} }
} }

View File

@ -1,8 +1,13 @@
[uwsgi] [uwsgi]
chdir=/home/randomsec/RandomSec/MUOR chdir=/home/randomsec/RandomSec/MUOR/MUOR
module=MUOR.wsgi:application module=MUOR.wsgi
master=True master=True
pidfile=/home/randomsec/project-master.pid pidfile=/home/randomsec/uwsgi-file/project-master.pid
vacuum=True vacuum=True
max-requests=5000 max-requests=5000
daemonize=/home/randomsec/RandomSec/log/logs.log daemonize=/home/randomsec/RandomSec/log/logs.log
socket=0.0.0.0:8080
buffer-size=32768
plugins = python3

View File

@ -1,6 +1,7 @@
Django Django
django-crispy-forms django-crispy-forms
docker docker
uwsgi
celery celery
redis redis
django-redis django-redis