|
437 | 437 |
|
438 | 438 | # Virtualmin-provided packages
|
439 | 439 | vmgroup="'Virtualmin Core'"
|
| 440 | +vmgroupid="virtualmincore" |
440 | 441 | vmgrouptext="Virtualmin $vm_version provided packages"
|
441 | 442 | debvmpackages="virtualmin-core"
|
442 | 443 | deps=
|
443 | 444 |
|
444 | 445 | if [ "$mode" = 'full' ]; then
|
445 | 446 | if [ "$bundle" = 'LAMP' ]; then
|
446 | 447 | rhgroup="'Virtualmin LAMP Stack'"
|
| 448 | + rhgroupid="virtualmin-lamp" |
447 | 449 | rhgrouptext="Virtualmin $vm_version LAMP stack"
|
448 | 450 | debdeps="virtualmin-lamp-stack"
|
449 | 451 | ubudeps="virtualmin-lamp-stack"
|
450 | 452 | elif [ "$bundle" = 'LEMP' ]; then
|
451 | 453 | rhgroup="'Virtualmin LEMP Stack'"
|
| 454 | + rhgroupid="virtualmin-lemp" |
452 | 455 | rhgrouptext="Virtualmin $vm_version LEMP stack"
|
453 | 456 | debdeps="virtualmin-lemp-stack"
|
454 | 457 | ubudeps="virtualmin-lemp-stack"
|
455 | 458 | fi
|
456 | 459 | elif [ "$mode" = 'mini' ]; then
|
457 | 460 | if [ "$bundle" = 'LAMP' ]; then
|
458 | 461 | rhgroup="'Virtualmin LAMP Stack Minimal'"
|
| 462 | + rhgroupid="virtualmin-lamp-minimal" |
459 | 463 | rhgrouptext="Virtualmin $vm_version LAMP stack mini"
|
460 | 464 | debdeps="virtualmin-lamp-stack-minimal"
|
461 | 465 | ubudeps="virtualmin-lamp-stack-minimal"
|
462 | 466 | elif [ "$bundle" = 'LEMP' ]; then
|
463 | 467 | rhgroup="'Virtualmin LEMP Stack Minimal'"
|
| 468 | + rhgroupid="virtualmin-lemp-minimal" |
464 | 469 | rhgrouptext="Virtualmin $vm_version LEMP stack mini'"
|
465 | 470 | debdeps="virtualmin-lemp-stack-minimal"
|
466 | 471 | ubudeps="virtualmin-lemp-stack-minimal"
|
467 | 472 | fi
|
468 | 473 | elif [ "$mode" = 'micro' ]; then
|
469 | 474 | if [ "$bundle" = 'LAMP' ]; then
|
470 | 475 | rhgroup="'Virtualmin LAMP Stack Micro'"
|
| 476 | + rhgroupid="virtualmin-lamp-micro" |
471 | 477 | rhgrouptext="Virtualmin $vm_version LAMP stack micro"
|
472 | 478 | debdeps="virtualmin-lamp-stack-micro"
|
473 | 479 | ubudeps="virtualmin-lamp-stack-micro"
|
474 | 480 | elif [ "$bundle" = 'LEMP' ]; then
|
475 | 481 | rhgroup="'Virtualmin LEMP Stack Micro'"
|
| 482 | + rhgroupid="virtualmin-lemp-micro" |
476 | 483 | rhgrouptext="Virtualmin $vm_version LEMP stack micro"
|
477 | 484 | debdeps="virtualmin-lemp-stack-micro"
|
478 | 485 | ubudeps="virtualmin-lemp-stack-micro"
|
479 | 486 | fi
|
480 | 487 | elif [ "$mode" = 'nano' ]; then
|
481 | 488 | if [ "$bundle" = 'LAMP' ]; then
|
482 | 489 | rhgroup="'Virtualmin LAMP Stack Nano'"
|
| 490 | + rhgroupid="virtualmin-lamp-nano" |
483 | 491 | rhgrouptext="Virtualmin $vm_version LAMP stack nano"
|
484 | 492 | debdeps="virtualmin-lamp-stack-nano"
|
485 | 493 | ubudeps="virtualmin-lamp-stack-nano"
|
486 | 494 | elif [ "$bundle" = 'LEMP' ]; then
|
487 | 495 | rhgroup="'Virtualmin LEMP Stack Nano'"
|
| 496 | + rhgroupid="virtualmin-lemp-nano" |
488 | 497 | rhgrouptext="Virtualmin $vm_version LEMP stack nano"
|
489 | 498 | debdeps="virtualmin-lemp-stack-nano"
|
490 | 499 | ubudeps="virtualmin-lemp-stack-nano"
|
@@ -1782,8 +1791,8 @@ install_with_yum() {
|
1782 | 1791 | fi
|
1783 | 1792 |
|
1784 | 1793 | # Install core and stack
|
1785 |
| - run_ok "$install_group $rhgroup" "Installing dependencies and system packages" |
1786 |
| - run_ok "$install_group $vmgroup" "Installing Virtualmin $vm_version and all related packages" |
| 1794 | + run_ok "$install_group $rhgroupid" "Installing dependencies and system packages" |
| 1795 | + run_ok "$install_group $vmgroupid" "Installing Virtualmin $vm_version and all related packages" |
1787 | 1796 | rs=$?
|
1788 | 1797 | if [ $? -ne 0 ]; then
|
1789 | 1798 | fatal "Installation failed: $rs"
|
|
0 commit comments