@@ -372,7 +372,7 @@ case $distro in
372
372
supervisor_conf_path=/etc/supervisor/conf.d
373
373
supervisor_file_name=webvirtcloud.conf
374
374
;;
375
- * centos* |* redhat* |* ol* |* rhel* |* rocky* |* alma* )
375
+ * centos* |* redhat* |* ol* |* rhel* |* rocky* |* Rocky * | * alma* )
376
376
echo " The installer has detected $distro version $version ."
377
377
distro=centos
378
378
nginx_group=nginx
469
469
echo " Setting novnc host ip $novncd_host "
470
470
echo " "
471
471
472
-
472
+ echo " ========="
473
+ echo " distro: ${distro} "
474
+ echo " ========="
473
475
case $distro in
474
476
debian)
475
477
if [[ " $version " -ge 9 ]]; then
@@ -481,9 +483,10 @@ case $distro in
481
483
progress
482
484
483
485
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
+
485
488
install_packages
486
-
489
+
487
490
set_hosts
488
491
489
492
install_webvirtcloud
@@ -492,6 +495,7 @@ case $distro in
492
495
configure_nginx
493
496
494
497
echo " * Configuring Supervisor."
498
+ log " pip install supervisor "
495
499
configure_supervisor
496
500
497
501
restart_supervisor
@@ -508,7 +512,7 @@ case $distro in
508
512
progress
509
513
510
514
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"
512
516
install_packages
513
517
514
518
set_hosts
@@ -519,6 +523,7 @@ case $distro in
519
523
configure_nginx
520
524
521
525
echo " * Configuring Supervisor."
526
+ log " pip install supervisor "
522
527
configure_supervisor
523
528
524
529
restart_supervisor
@@ -527,15 +532,15 @@ case $distro in
527
532
fi
528
533
;;
529
534
centos)
530
- if [[ " $version " =~ ^8 ]]; then
535
+ if [[ " $version " =~ ^8 ]] || [[ " $version " =~ ^9 ]] ; then
531
536
# Install for CentOS/Redhat 8
532
537
tzone=\' $( timedatectl| grep " Time zone" | awk ' {print $3}' ) \'
533
538
534
539
echo " * Adding wget & epel-release repository."
535
540
log " yum -y install wget epel-release"
536
541
537
542
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 "
539
544
install_packages
540
545
541
546
set_hosts
@@ -546,6 +551,7 @@ case $distro in
546
551
configure_nginx
547
552
548
553
echo " * Configuring Supervisor."
554
+ log " pip install supervisor "
549
555
configure_supervisor
550
556
551
557
set_firewall
@@ -568,9 +574,9 @@ case $distro in
568
574
569
575
echo " * Installing OS requirements."
570
576
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"
572
578
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"
574
580
fi
575
581
install_packages
576
582
@@ -582,6 +588,7 @@ case $distro in
582
588
configure_nginx
583
589
584
590
echo " * Configuring Supervisor."
591
+ log " pip install supervisor "
585
592
configure_supervisor
586
593
587
594
set_firewall
@@ -598,7 +605,7 @@ case $distro in
598
605
tzone=\' $( timedatectl| grep " Time zone" | awk ' {print $3}' ) \'
599
606
600
607
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"
602
609
install_packages
603
610
604
611
set_hosts
@@ -609,6 +616,7 @@ case $distro in
609
616
configure_nginx
610
617
611
618
echo " * Configuring Supervisor."
619
+ log " pip install supervisor "
612
620
configure_supervisor
613
621
614
622
set_firewall
0 commit comments