diff --git a/conf/nginx/openEuler_nginx.conf b/conf/nginx/openEuler_nginx.conf deleted file mode 100644 index dfa72fc..0000000 --- a/conf/nginx/openEuler_nginx.conf +++ /dev/null @@ -1,38 +0,0 @@ -# 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 2048; - - 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; - -} diff --git a/webvirtcloud.sh b/webvirtcloud.sh old mode 100755 new mode 100644 index 9871a46..41d13a2 --- a/webvirtcloud.sh +++ b/webvirtcloud.sh @@ -119,7 +119,7 @@ install_packages () { fi done; ;; - fedora|uos|openEuler) + fedora|uos) for p in $PACKAGES; do if dnf list installed "$p" >/dev/null 2>&1; then echo " * $p already installed" @@ -352,15 +352,6 @@ case $distro in supervisor_conf_path=/etc/supervisord.d supervisor_file_name=webvirtcloud.ini ;; - *OpenEuler*|*openEuler*) - echo " The installer has detected $distro version $version." - distro=openEuler - 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 @@ -534,33 +525,6 @@ case $distro in restart_nginx fi ;; - openEuler) - if [[ "$version" == "20.03" ]]; then - # Install for openEuler 20.03 - 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