j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-26 08:05:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #599 from catborise/master

Browse source 
update requirements & fix install scripts
This commit is contained in:
catborise 2023-09-06 09:50:56 +03:00 committed by GitHub
commit 5e368d1ee0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conf/requirements.txt
View file

@ -1,4 +1,4 @@
Django==4.2.4 Django==4.2.5
django_bootstrap5==23.3 django_bootstrap5==23.3
django-bootstrap-icons==0.8.3 django-bootstrap-icons==0.8.3
django-login-required-middleware==0.9.0 django-login-required-middleware==0.9.0
@ -6,15 +6,15 @@ django-otp==1.2.2
django-qr-code==3.1.1 django-qr-code==3.1.1
gunicorn==21.2.0 gunicorn==21.2.0
libsass==0.22.0 libsass==0.22.0
libvirt-python==9.6.0 libvirt-python==9.7.0
lxml==4.9.3 lxml==4.9.3
qrcode==7.4.2 qrcode==7.4.2
rwlock==0.0.7 rwlock==0.0.7
websockify==0.10.0 websockify==0.11.0
zipp==3.16.2 zipp==3.16.2
ldap3==2.9.1 ldap3==2.9.1
python-engineio==4.5.1 python-engineio==4.7.0
python-socketio==5.8.0 python-socketio==5.9.0
eventlet==0.33.3 eventlet==0.33.3
djangorestframework==3.14.0 djangorestframework==3.14.0
drf-nested-routers==0.93.4 drf-nested-routers==0.93.4

2
dev/libvirt-bootstrap.sh
View file

@ -680,7 +680,7 @@ install_debian() {
apt-get update || return 1 apt-get update || return 1
if [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then if [ "$DISTRO_MAJOR_VERSION" -lt 10 ]; then
apt-get -y install qemu-kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1 apt-get -y install qemu-kvm libvirt-bin bridge-utils sasl2-bin python-guestfs supervisor || return 1
else [ "$DISTRO_MAJOR_VERSION" -lt 12 ]; then elif [ "$DISTRO_MAJOR_VERSION" -lt 12 ]; then
apt-get -y install qemu qemu-kvm qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin python3-guestfs virtinst supervisor || return 1 apt-get -y install qemu qemu-kvm qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin python3-guestfs virtinst supervisor || return 1
else else
apt-get -y install qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin python3-guestfs virtinst supervisor || return 1 apt-get -y install qemu-system qemu-utils libvirt-clients libvirt-daemon-system sasl2-bin python3-guestfs virtinst supervisor || return 1

11
webvirtcloud.sh
View file

@ -246,6 +246,13 @@ install_webvirtcloud () {
sed -i "s|^\\(WS_PUBLIC_PORT = \\).*|\\1$novncd_public_port_escape|" "$APP_PATH/webvirtcloud/settings.py" sed -i "s|^\\(WS_PUBLIC_PORT = \\).*|\\1$novncd_public_port_escape|" "$APP_PATH/webvirtcloud/settings.py"
sed -i "s|^\\(WS_HOST = \\).*|\\1\'$novncd_host_escape\'|" "$APP_PATH/webvirtcloud/settings.py" sed -i "s|^\\(WS_HOST = \\).*|\\1\'$novncd_host_escape\'|" "$APP_PATH/webvirtcloud/settings.py"
# set CSRF TRUSTED ORIGINS
host_ip="'http://127.0.0.1', "
for i in $(hostname -I); do
host_ip+="'http://$i', "
done
sed -i "s|^\\(CSRF_TRUSTED_ORIGINS = \\).*|\\1\[ \'http://$fqdn\', $host_ip ]|" /srv/webvirtcloud/webvirtcloud/settings.py
echo "* Activate virtual environment." echo "* Activate virtual environment."
activate_python_environment activate_python_environment
@ -409,6 +416,7 @@ case $distro in
;; ;;
esac esac
fqdn="localhost"
setupfqdn=default setupfqdn=default
until [[ $setupfqdn == "yes" ]] || [[ $setupfqdn == "no" ]]; do until [[ $setupfqdn == "yes" ]] || [[ $setupfqdn == "no" ]]; do
echo -n " Q. Do you want to configure fqdn for Nginx? (y/n) " echo -n " Q. Do you want to configure fqdn for Nginx? (y/n) "
@ -418,9 +426,6 @@ until [[ $setupfqdn == "yes" ]] || [[ $setupfqdn == "no" ]]; do
[yY] | [yY][Ee][Ss] ) [yY] | [yY][Ee][Ss] )
echo -n " Q. What is the FQDN of your server? ($(hostname --fqdn)): " echo -n " Q. What is the FQDN of your server? ($(hostname --fqdn)): "
read -r fqdn read -r fqdn
if [ -z "$fqdn" ]; then
readonly fqdn="$(hostname --fqdn)"
fi
setupfqdn="yes" setupfqdn="yes"
echo " Setting to $fqdn" echo " Setting to $fqdn"
echo "" echo ""