1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-25 15:45:23 +00:00

Compare commits

...

2 commits

Author SHA1 Message Date
catborise
f725d8ec18
Merge pull request #654 from wahello/master
pip install supervisor
2024-08-02 10:37:05 +03:00
nono
9e4dc3256e pip install supervisor 2024-08-02 09:41:06 +08:00

View file

@ -372,7 +372,7 @@ case $distro in
supervisor_conf_path=/etc/supervisor/conf.d supervisor_conf_path=/etc/supervisor/conf.d
supervisor_file_name=webvirtcloud.conf supervisor_file_name=webvirtcloud.conf
;; ;;
*centos*|*redhat*|*ol*|*rhel*|*rocky*|*alma*) *centos*|*redhat*|*ol*|*rhel*|*rocky*|*Rocky*|*alma*)
echo " The installer has detected $distro version $version." echo " The installer has detected $distro version $version."
distro=centos distro=centos
nginx_group=nginx nginx_group=nginx
@ -469,7 +469,9 @@ fi
echo " Setting novnc host ip $novncd_host" echo " Setting novnc host ip $novncd_host"
echo "" echo ""
echo "========="
echo "distro: ${distro}"
echo "========="
case $distro in case $distro in
debian) debian)
if [[ "$version" -ge 9 ]]; then if [[ "$version" -ge 9 ]]; then
@ -481,9 +483,10 @@ case $distro in
progress progress
echo "* Installing OS requirements." echo "* Installing OS requirements."
PACKAGES="git virtualenv python3-virtualenv python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev libsasl2-dev libldap2-dev nginx supervisor smbios-utils libsasl2-modules gcc pkg-config python3-guestfs uuid" PACKAGES="git virtualenv python3-virtualenv python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev libsasl2-dev libldap2-dev nginx smbios-utils libsasl2-modules gcc pkg-config python3-guestfs uuid"
install_packages install_packages
set_hosts set_hosts
install_webvirtcloud install_webvirtcloud
@ -492,6 +495,7 @@ case $distro in
configure_nginx configure_nginx
echo "* Configuring Supervisor." echo "* Configuring Supervisor."
log "pip install supervisor "
configure_supervisor configure_supervisor
restart_supervisor restart_supervisor
@ -508,7 +512,7 @@ case $distro in
progress progress
echo "* Installing OS requirements." echo "* Installing OS requirements."
PACKAGES="git virtualenv python3-virtualenv python3-pip python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx supervisor libsasl2-modules gcc pkg-config python3-guestfs" PACKAGES="git virtualenv python3-virtualenv python3-pip python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx libsasl2-modules gcc pkg-config python3-guestfs"
install_packages install_packages
set_hosts set_hosts
@ -519,6 +523,7 @@ case $distro in
configure_nginx configure_nginx
echo "* Configuring Supervisor." echo "* Configuring Supervisor."
log "pip install supervisor "
configure_supervisor configure_supervisor
restart_supervisor restart_supervisor
@ -527,7 +532,7 @@ case $distro in
fi fi
;; ;;
centos) centos)
if [[ "$version" =~ ^8 ]]; then if [[ "$version" =~ ^8 ]] || [[ "$version" =~ ^9 ]]; then
# Install for CentOS/Redhat 8 # Install for CentOS/Redhat 8
tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\' tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\'
@ -535,7 +540,7 @@ case $distro in
log "yum -y install wget epel-release" log "yum -y install wget epel-release"
echo "* Installing OS requirements." echo "* Installing OS requirements."
PACKAGES="git python3-virtualenv python3-devel libvirt-devel glibc gcc nginx supervisor python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5" PACKAGES="git python3-virtualenv python3-devel libvirt-devel glibc gcc nginx python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5 openldap-devel"
install_packages install_packages
set_hosts set_hosts
@ -546,6 +551,7 @@ case $distro in
configure_nginx configure_nginx
echo "* Configuring Supervisor." echo "* Configuring Supervisor."
log "pip install supervisor "
configure_supervisor configure_supervisor
set_firewall set_firewall
@ -568,9 +574,9 @@ case $distro in
echo "* Installing OS requirements." echo "* Installing OS requirements."
if test "${codename}" == "eagle"; then if test "${codename}" == "eagle"; then
PACKAGES="git virtualenv python3-virtualenv python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx supervisor libsasl2-modules gcc pkg-config python3-guestfs uuid" PACKAGES="git virtualenv python3-virtualenv python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx libsasl2-modules gcc pkg-config python3-guestfs uuid"
else else
PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx supervisor python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5" PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5"
fi fi
install_packages install_packages
@ -582,6 +588,7 @@ case $distro in
configure_nginx configure_nginx
echo "* Configuring Supervisor." echo "* Configuring Supervisor."
log "pip install supervisor "
configure_supervisor configure_supervisor
set_firewall set_firewall
@ -598,7 +605,7 @@ case $distro in
tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\' tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\'
echo "* Installing OS requirements." 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" PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5"
install_packages install_packages
set_hosts set_hosts
@ -609,6 +616,7 @@ case $distro in
configure_nginx configure_nginx
echo "* Configuring Supervisor." echo "* Configuring Supervisor."
log "pip install supervisor "
configure_supervisor configure_supervisor
set_firewall set_firewall