j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-01-13 08:55:17 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: j3d1:9a675918c683d76b621ebd405960fd4c2e3be324
Branches Tags
j3d1:master
j3d1:v1.0
...
compare: j3d1:2ff0abf8c5485e0732f3102110f675a5167f7d2f
Branches Tags
j3d1:master
j3d1:v1.0

11 commits
9a675918c6 ... 2ff0abf8c5

Author SHA1 Message Date
catborise
2ff0abf8c5
Merge pull request #619 from catborise/master 
update requirements
 2023-10-30 15:59:51 +03:00
catborise
7171a70f75 update requirements 2023-10-30 15:56:54 +03:00
catborise
8995f47c13
Merge pull request #617 from 0x6d61726b/patch-01_X-Forwarded-Proto 
Fixed nginx X-Forwarded-Proto to match the protocol ("http", "https")
 2023-10-30 15:53:40 +03:00
catborise
f912dfccdb
Merge pull request #618 from 0x6d61726b/patch-02_install-nginx-upstream-wsnovncd 
Fixes Quick Install overrides nginx upstream wssocketiod
 2023-10-30 15:52:01 +03:00
catborise
911bd54916
Merge pull request #613 from MisterBlueBear/nginx_conf 
nginx conf - Fix for issue #577
 2023-10-30 15:51:24 +03:00
catborise
6974eae62e static_root and static_dirs fix 2023-10-30 15:36:40 +03:00
Mark
cc86730441
Corrected X-Forwarded-Proto meaning for Gunicorn 2023-10-26 22:43:27 +02:00
Mark
5c6bcbe610
Fixes issue #614: Quick Install overrides nginx upstream wssocketiod port 2023-10-26 22:18:17 +02:00
Mark
2072890fc5
Fixed nginx X-Forwarded-Proto to match the protocol ("http", "https") 2023-10-26 21:53:04 +02:00
MisterBlueBear
4aafad668b Location /websockify proxy passes to wsnovncd 2023-10-26 13:12:20 -04:00
MisterBlueBear
31cace9994 nginx conf - Fix for issue #577 2023-10-18 21:42:57 -04:00
5 changed files with 25 additions and 18 deletions
Show stats Expand all files Collapse all files

8
conf/nginx/webvirtcloud.conf
View file

@ -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 {

14
conf/requirements.txt
View file

@ -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-socketio==5.9.0
python-engineio==4.8.0
python-socketio==5.10.0
eventlet==0.33.3
djangorestframework==3.14.0
drf-nested-routers==0.93.4

8
dev/requirements.txt
View file

@ -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
yapf==0.40.1
black==23.7.0
pylint==3.0.2
yapf==0.40.2
black==23.10.1

2
webvirtcloud.sh
View file

@ -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"
}

11
webvirtcloud/settings.py.template
View file

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