diff --git a/conf/nginx/openAnolis_nginx.conf b/conf/nginx/openAnolis_nginx.conf new file mode 100644 index 0000000..b6c342d --- /dev/null +++ b/conf/nginx/openAnolis_nginx.conf @@ -0,0 +1,83 @@ +# For more information on configuration, see: +# * Official English Documentation: http://nginx.org/en/docs/ +# * Official Russian Documentation: http://nginx.org/ru/docs/ + +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log; +pid /run/nginx.pid; + +# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic. +include /usr/share/nginx/modules/*.conf; + +events { + worker_connections 1024; +} + +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + tcp_nopush on; + tcp_nodelay on; + keepalive_timeout 65; + types_hash_max_size 4096; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + # Load modular configuration files from the /etc/nginx/conf.d directory. + # See http://nginx.org/en/docs/ngx_core_module.html#include + # for more information. + include /etc/nginx/conf.d/*.conf; + + server { + listen 80; + listen [::]:80; + server_name _; + root /usr/share/nginx/html; + + # Load configuration files for the default server block. + include /etc/nginx/default.d/*.conf; + + error_page 404 /404.html; + location = /404.html { + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + } + } + +# Settings for a TLS enabled server. +# +# server { +# listen 443 ssl http2; +# listen [::]:443 ssl http2; +# server_name _; +# root /usr/share/nginx/html; +# +# ssl_certificate "/etc/pki/nginx/server.crt"; +# ssl_certificate_key "/etc/pki/nginx/private/server.key"; +# ssl_session_cache shared:SSL:1m; +# ssl_session_timeout 10m; +# ssl_ciphers PROFILE=SYSTEM; +# ssl_prefer_server_ciphers on; +# +# # Load configuration files for the default server block. +# include /etc/nginx/default.d/*.conf; +# +# error_page 404 /404.html; +# location = /40x.html { +# } +# +# error_page 500 502 503 504 /50x.html; +# location = /50x.html { +# } +# } + +} diff --git a/conf/requirements.txt b/conf/requirements.txt index 1d8933a..d423749 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,26 +1,26 @@ -Django==4.2.16 -django_bootstrap5==24.3 +Django==4.2.20 +django_bootstrap5==25.1 django-bootstrap-icons==0.9.0 django-login-required-middleware==0.9.0 django-otp==1.5.4 django-qr-code==4.1.0 -django-auth-ldap==5.0.0 +django-auth-ldap==5.1.0 djangorestframework==3.15.2 drf-nested-routers==0.94.1 -drf-yasg==1.21.7 -eventlet==0.37.0 +drf-yasg==1.21.10 +eventlet==0.39.1 gunicorn==23.0.0 libsass==0.23.0 -libvirt-python==10.8.0 -lxml==5.3.0 +libvirt-python==11.1.0 +lxml==5.3.1 ldap3==2.9.1 markdown==3.6 #psycopg2-binary -python-engineio==4.10.1 -python-socketio==5.11.4 +python-engineio==4.11.2 +python-socketio==5.12.1 qrcode==8.0 rwlock==0.0.7 tzdata websockify==0.12.0 -whitenoise==6.7.0 -zipp==3.20.2 +whitenoise==6.9.0 +zipp==3.21.0 diff --git a/dev/requirements.txt b/dev/requirements.txt index 94d1a8f..00ceebc 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,9 +1,9 @@ -r ../conf/requirements.txt -coverage==7.6.3 -django-debug-toolbar==4.4.6 +coverage==7.6.12 +django-debug-toolbar==5.0.1 django-debug-toolbar-template-profiler pycodestyle==2.12.1 pyflakes==3.2.0 -pylint==3.3.1 -yapf==0.40.2 -black==24.10.0 +pylint==3.3.5 +yapf==0.43.0 +black==25.1.0 diff --git a/webvirtcloud.sh b/webvirtcloud.sh index 13ad747..f1011a3 100755 --- a/webvirtcloud.sh +++ b/webvirtcloud.sh @@ -119,7 +119,7 @@ install_packages () { fi done; ;; - fedora|openEuler) + fedora|openEuler|openAnolis) for p in $PACKAGES; do if dnf list installed "$p" >/dev/null 2>&1; then echo " * $p already installed" @@ -411,6 +411,15 @@ case $distro in supervisor_conf_path=/etc/supervisord.d supervisor_file_name=webvirtcloud.ini ;; + *OpenAnolis*|*openAnolis*) + echo " The installer has detected $distro version $version." + distro=openAnolis + nginx_group=nginx + nginxfile=/etc/nginx/conf.d/$APP_NAME.conf + supervisor_service=supervisord + supervisor_conf_path=/etc/supervisord.d + supervisor_file_name=webvirtcloud.ini + ;; *) echo " The installer was unable to determine your OS. Exiting for safety." exit 1 @@ -627,6 +636,33 @@ case $distro in restart_nginx fi ;; + openAnolis) + if [[ "$version" == "8.4" ]]; then + # Install for openAnolis 8.4 + tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\' + + echo "* Installing OS requirements." + PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx supervisor python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5" + install_packages + + set_hosts + + install_webvirtcloud + + echo "* Configuring Nginx." + configure_nginx + + echo "* Configuring Supervisor." + configure_supervisor + + set_firewall + + set_selinux + + restart_supervisor + restart_nginx + fi + ;; esac