From 9c1c281279660374c71c09636e0cfe042c438259 Mon Sep 17 00:00:00 2001
From: maqi <maqi@uniontech.com>
Date: Thu, 1 Sep 2022 16:43:42 +0800
Subject: [PATCH 1/2] add support openAnolis

---
 conf/nginx/openAnolis_nginx.conf | 83 ++++++++++++++++++++++++++++++++
 webvirtcloud.sh                  | 38 ++++++++++++++-
 2 files changed, 120 insertions(+), 1 deletion(-)
 create mode 100644 conf/nginx/openAnolis_nginx.conf

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/webvirtcloud.sh b/webvirtcloud.sh
index 5b5248e..e124219 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"
@@ -403,6 +403,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=uos
+    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
@@ -607,6 +616,33 @@ case $distro in
     restart_nginx
   fi
   ;;
+  openAnolis)
+  if [[ "$version" == "20" ]]; then
+    # Install for openAnolis 20
+    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
 
 

From 55793d3901b7e08041b857989b3c921e91d6e9e1 Mon Sep 17 00:00:00 2001
From: MAQI7 <97730261+MAQI7@users.noreply.github.com>
Date: Fri, 2 Sep 2022 02:06:39 +0000
Subject: [PATCH 2/2] Update webvirtcloud.sh

---
 webvirtcloud.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webvirtcloud.sh b/webvirtcloud.sh
index e124219..2cd9705 100755
--- a/webvirtcloud.sh
+++ b/webvirtcloud.sh
@@ -405,7 +405,7 @@ case $distro in
     ;;
   *OpenAnolis*|*openAnolis*)
     echo "  The installer has detected $distro version $version."
-    distro=uos
+    distro=openAnolis
     nginx_group=nginx
     nginxfile=/etc/nginx/conf.d/$APP_NAME.conf
     supervisor_service=supervisord
@@ -617,8 +617,8 @@ case $distro in
   fi
   ;;
   openAnolis)
-  if [[ "$version" == "20" ]]; then
-    # Install for openAnolis 20
+  if [[ "$version" == "8.4" ]]; then
+    # Install for openAnolis 8.4
     tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\'
 
     echo "* Installing OS requirements."