Skip to content

Commit 9e4dc32

Browse files
committed
pip install supervisor
1 parent 218ec5d commit 9e4dc32

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

webvirtcloud.sh

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ case $distro in
372372
supervisor_conf_path=/etc/supervisor/conf.d
373373
supervisor_file_name=webvirtcloud.conf
374374
;;
375-
*centos*|*redhat*|*ol*|*rhel*|*rocky*|*alma*)
375+
*centos*|*redhat*|*ol*|*rhel*|*rocky*|*Rocky*|*alma*)
376376
echo " The installer has detected $distro version $version."
377377
distro=centos
378378
nginx_group=nginx
@@ -469,7 +469,9 @@ fi
469469
echo " Setting novnc host ip $novncd_host"
470470
echo ""
471471

472-
472+
echo "========="
473+
echo "distro: ${distro}"
474+
echo "========="
473475
case $distro in
474476
debian)
475477
if [[ "$version" -ge 9 ]]; then
@@ -481,9 +483,10 @@ case $distro in
481483
progress
482484

483485
echo "* Installing OS requirements."
484-
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"
486+
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"
487+
485488
install_packages
486-
489+
487490
set_hosts
488491

489492
install_webvirtcloud
@@ -492,6 +495,7 @@ case $distro in
492495
configure_nginx
493496

494497
echo "* Configuring Supervisor."
498+
log "pip install supervisor "
495499
configure_supervisor
496500

497501
restart_supervisor
@@ -508,7 +512,7 @@ case $distro in
508512
progress
509513

510514
echo "* Installing OS requirements."
511-
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"
515+
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"
512516
install_packages
513517

514518
set_hosts
@@ -519,6 +523,7 @@ case $distro in
519523
configure_nginx
520524

521525
echo "* Configuring Supervisor."
526+
log "pip install supervisor "
522527
configure_supervisor
523528

524529
restart_supervisor
@@ -527,15 +532,15 @@ case $distro in
527532
fi
528533
;;
529534
centos)
530-
if [[ "$version" =~ ^8 ]]; then
535+
if [[ "$version" =~ ^8 ]] || [[ "$version" =~ ^9 ]]; then
531536
# Install for CentOS/Redhat 8
532537
tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\'
533538

534539
echo "* Adding wget & epel-release repository."
535540
log "yum -y install wget epel-release"
536541

537542
echo "* Installing OS requirements."
538-
PACKAGES="git python3-virtualenv python3-devel libvirt-devel glibc gcc nginx supervisor python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5"
543+
PACKAGES="git python3-virtualenv python3-devel libvirt-devel glibc gcc nginx python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5 openldap-devel"
539544
install_packages
540545

541546
set_hosts
@@ -546,6 +551,7 @@ case $distro in
546551
configure_nginx
547552

548553
echo "* Configuring Supervisor."
554+
log "pip install supervisor "
549555
configure_supervisor
550556

551557
set_firewall
@@ -568,9 +574,9 @@ case $distro in
568574

569575
echo "* Installing OS requirements."
570576
if test "${codename}" == "eagle"; then
571-
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"
577+
PACKAGES="git virtualenv python3-virtualenv python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev nginx libsasl2-modules gcc pkg-config python3-guestfs uuid"
572578
else
573-
PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx supervisor python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5"
579+
PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5"
574580
fi
575581
install_packages
576582

@@ -582,6 +588,7 @@ case $distro in
582588
configure_nginx
583589

584590
echo "* Configuring Supervisor."
591+
log "pip install supervisor "
585592
configure_supervisor
586593

587594
set_firewall
@@ -598,7 +605,7 @@ case $distro in
598605
tzone=\'$(timedatectl|grep "Time zone"| awk '{print $3}')\'
599606

600607
echo "* Installing OS requirements."
601-
PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx supervisor python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5"
608+
PACKAGES="git python3-virtualenv python3-devel python3-pip libvirt-devel glibc gcc nginx python3-lxml python3-libguestfs iproute-tc cyrus-sasl-md5"
602609
install_packages
603610

604611
set_hosts
@@ -609,6 +616,7 @@ case $distro in
609616
configure_nginx
610617

611618
echo "* Configuring Supervisor."
619+
log "pip install supervisor "
612620
configure_supervisor
613621

614622
set_firewall

0 commit comments

Comments
 (0)