Merge pull request #619 from catborise/master

update requirements

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 $remote_addr;
+        proxy_set_header X-Forwarded-Proto http;
         proxy_set_header X-Forwarded-Ssl off;
         proxy_connect_timeout 1800;
         proxy_read_timeout 1800;
@@ -34,6 +34,12 @@ 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 {

conf/requirements.txt

@@ -1,20 +1,20 @@
-Django==4.2.5
+Django==4.2.6
 django_bootstrap5==23.3
-django-bootstrap-icons==0.8.3
+django-bootstrap-icons==0.8.6
 django-login-required-middleware==0.9.0
-django-otp==1.2.2
+django-otp==1.2.4
 django-qr-code==3.1.1
 gunicorn==21.2.0
 libsass==0.22.0
-libvirt-python==9.7.0
+libvirt-python==9.8.0
 lxml==4.9.3
 qrcode==7.4.2
 rwlock==0.0.7
 websockify==0.11.0
-zipp==3.16.2
+zipp==3.17.0
 ldap3==2.9.1
-python-engineio==4.7.0
+python-engineio==4.8.0
-python-socketio==5.9.0
+python-socketio==5.10.0
 eventlet==0.33.3
 djangorestframework==3.14.0
 drf-nested-routers==0.93.4

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.0
+pycodestyle==2.11.1
 pyflakes==3.1.0
-pylint==2.17.5
+pylint==3.0.2
-yapf==0.40.1
+yapf==0.40.2
-black==23.7.0
+black==23.10.1

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:\\).*|\\1$novncd_port_escape;|" "$nginxfile"
+  sed -i "s|server 127.0.0.1:6080;|server 127.0.0.1:$novncd_port_escape;|" "$nginxfile"
 
 }
 

webvirtcloud/settings.py.template

@@ -127,11 +127,12 @@ USE_TZ = True
 STATIC_URL = "/static/"
 
 if not DEBUG:
-    STATIC_ROOT = Path.joinpath(BASE_DIR, "static")
+    STATIC_ROOT = ""
-else:
+
-    STATICFILES_DIRS = [
+STATICFILES_DIRS = [
-        Path.joinpath(BASE_DIR, "static"),
+    Path.joinpath(BASE_DIR, "static"),
-    ]
+]
+
 
 BS_ICONS_CACHE = Path.joinpath(BASE_DIR, 'static/icon_cache')