diff --git a/conf/nginx/webvirtcloud.conf b/conf/nginx/webvirtcloud.conf index ae2edf8..3ba36ec 100644 --- a/conf/nginx/webvirtcloud.conf +++ b/conf/nginx/webvirtcloud.conf @@ -14,7 +14,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for; proxy_set_header Host $host:$server_port; - proxy_set_header X-Forwarded-Proto http; + proxy_set_header X-Forwarded-Proto $remote_addr; proxy_set_header X-Forwarded-Ssl off; proxy_connect_timeout 1800; proxy_read_timeout 1800; @@ -34,12 +34,6 @@ server { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } - location /websockify { - proxy_pass http://wsnovncd; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } } upstream wsnovncd { diff --git a/conf/requirements.txt b/conf/requirements.txt index 1321e22..a9390be 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,20 +1,20 @@ -Django==4.2.6 +Django==4.2.5 django_bootstrap5==23.3 -django-bootstrap-icons==0.8.6 +django-bootstrap-icons==0.8.3 django-login-required-middleware==0.9.0 -django-otp==1.2.4 +django-otp==1.2.2 django-qr-code==3.1.1 gunicorn==21.2.0 libsass==0.22.0 -libvirt-python==9.8.0 +libvirt-python==9.7.0 lxml==4.9.3 qrcode==7.4.2 rwlock==0.0.7 websockify==0.11.0 -zipp==3.17.0 +zipp==3.16.2 ldap3==2.9.1 -python-engineio==4.8.0 -python-socketio==5.10.0 +python-engineio==4.7.0 +python-socketio==5.9.0 eventlet==0.33.3 djangorestframework==3.14.0 drf-nested-routers==0.93.4 diff --git a/dev/requirements.txt b/dev/requirements.txt index 45c1c6a..0ff16a8 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -2,8 +2,8 @@ coverage==7.3.0 django-debug-toolbar==4.2.0 django-debug-toolbar-template-profiler -pycodestyle==2.11.1 +pycodestyle==2.11.0 pyflakes==3.1.0 -pylint==3.0.2 -yapf==0.40.2 -black==23.10.1 +pylint==2.17.5 +yapf==0.40.1 +black==23.7.0 diff --git a/webvirtcloud.sh b/webvirtcloud.sh index f66cb0f..3df52bd 100755 --- a/webvirtcloud.sh +++ b/webvirtcloud.sh @@ -174,7 +174,7 @@ configure_nginx () { fi novncd_port_escape="$(echo -n "$novncd_port"|sed -e 's/[](){}<>=:\!\?\+\|\/\&$*.^[]/\\&/g')" - sed -i "s|server 127.0.0.1:6080;|server 127.0.0.1:$novncd_port_escape;|" "$nginxfile" + sed -i "s|\\(server 127.0.0.1:\\).*|\\1$novncd_port_escape;|" "$nginxfile" } diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template index 1479e22..d3b9fd9 100644 --- a/webvirtcloud/settings.py.template +++ b/webvirtcloud/settings.py.template @@ -127,12 +127,11 @@ USE_TZ = True STATIC_URL = "/static/" if not DEBUG: - STATIC_ROOT = "" - -STATICFILES_DIRS = [ - Path.joinpath(BASE_DIR, "static"), -] - + STATIC_ROOT = Path.joinpath(BASE_DIR, "static") +else: + STATICFILES_DIRS = [ + Path.joinpath(BASE_DIR, "static"), + ] BS_ICONS_CACHE = Path.joinpath(BASE_DIR, 'static/icon_cache')