From dba200787f7502f9f4eb960b66db5ceb288fc6b3 Mon Sep 17 00:00:00 2001
From: Alexey Berezhok <a@bayrepo.ru>
Date: Thu, 2 Jan 2025 17:18:21 +0300
Subject: [PATCH] Fixed passenger installation

---
 func_ruby/ext-modules/passenger_manager.mod      |  2 +-
 .../passenger_manager/passenger_installer.pp     | 16 ++++++++--------
 .../passenger_manager/passenger_uninstaller.pp   |  7 ++++++-
 web/list/extmodules/index.php                    |  5 +++++
 web/templates/pages/extmodules.php               | 12 ++++++++++++
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/func_ruby/ext-modules/passenger_manager.mod b/func_ruby/ext-modules/passenger_manager.mod
index 8704658..2fa6094 100644
--- a/func_ruby/ext-modules/passenger_manager.mod
+++ b/func_ruby/ext-modules/passenger_manager.mod
@@ -59,7 +59,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
     log_file = get_log
     f_uninst_pp = get_module_paydata("passenger_uninstaller.pp")
     if !check_domains_with_passenger
-      return "Presents domains with passenger support disable it first"
+      return log_return("Presents domains with passenger support disable it first")
     end
     begin
       log("uninstall packages for passenger + nginx support")
diff --git a/func_ruby/ext-modules/payload/passenger_manager/passenger_installer.pp b/func_ruby/ext-modules/payload/passenger_manager/passenger_installer.pp
index 5c10e4a..f25519a 100644
--- a/func_ruby/ext-modules/payload/passenger_manager/passenger_installer.pp
+++ b/func_ruby/ext-modules/payload/passenger_manager/passenger_installer.pp
@@ -1,39 +1,39 @@
-package {
+package { 'rubygems-devel':
   ensure   => installed,
   name     => 'rubygems-devel',
   provider => 'dnf',
 }
-package {
+-> package { 'rubygem-rake':
   ensure   => installed,
   name     => 'rubygem-rake',
   provider => 'dnf',
 }
-package {
+-> package { 'ruby-devel':
   ensure   => installed,
   name     => 'ruby-devel',
   provider => 'dnf',
 }
-package {
+-> package { 'rubygem-rack':
   ensure   => installed,
   name     => 'rubygem-rack',
   provider => 'dnf',
 }
-package {
+-> package { 'alt-brepo-ruby33-devel':
   ensure   => installed,
   name     => 'alt-brepo-ruby33-devel',
   provider => 'dnf',
 }
-package {
+-> package { 'alt-brepo-ruby33-rubygem-rake':
   ensure   => installed,
   name     => 'alt-brepo-ruby33-rubygem-rake',
   provider => 'dnf',
 }
-package {
+-> package { 'passenger-devel':
   ensure   => installed,
   name     => 'passenger-devel',
   provider => 'dnf',
 }
-package { 'passenger':
+-> package { 'passenger':
   ensure   => installed,
   name     => 'passenger',
   provider => 'dnf',
diff --git a/func_ruby/ext-modules/payload/passenger_manager/passenger_uninstaller.pp b/func_ruby/ext-modules/payload/passenger_manager/passenger_uninstaller.pp
index 0e3a511..461f06f 100644
--- a/func_ruby/ext-modules/payload/passenger_manager/passenger_uninstaller.pp
+++ b/func_ruby/ext-modules/payload/passenger_manager/passenger_uninstaller.pp
@@ -1,8 +1,13 @@
-package { 'nginx-passenger':
+package { 'nginx-mod-http-passenger':
   ensure   => absent,
   name     => 'nginx-mod-http-passenger',
   provider => 'dnf',
 }
+-> package { 'passenger-devel':
+  ensure   => absent,
+  name     => 'passenger-devel',
+  provider => 'dnf',
+}
 -> package { 'passenger':
   ensure   => absent,
   name     => 'passenger',
diff --git a/web/list/extmodules/index.php b/web/list/extmodules/index.php
index 875d328..602a53b 100644
--- a/web/list/extmodules/index.php
+++ b/web/list/extmodules/index.php
@@ -14,6 +14,11 @@ if ($_SESSION["userContext"] != "admin") {
 exec(HESTIA_CMD . "v-ext-modules list json", $output, $return_var);
 $data = json_decode(implode("", $output), true);
 ksort($data);
+$error_message = "";
+if (!empty($_SESSION["error_msg"])){
+	$error_message = $_SESSION["error_msg"];
+	$_SESSION["error_msg"] = "";
+}
 
 unset($output);
 
diff --git a/web/templates/pages/extmodules.php b/web/templates/pages/extmodules.php
index 4410ce4..0e856e2 100644
--- a/web/templates/pages/extmodules.php
+++ b/web/templates/pages/extmodules.php
@@ -12,6 +12,18 @@
 
 <div class="container">
 
+	<?php
+if (!empty($error_message)) {
+?>
+	<div class="u-text-center inline-alert inline-alert-danger u-mb20" role="alert">
+		<i class="fas fa-circle-exclamation"></i>
+		<p><?= $error_message ?></p>
+	</div>
+<?php
+}
+?>
+
+
 	<h1 class="u-text-center u-hide-desktop u-mt20 u-pr30 u-mb20 u-pl30"><?= _("List modules") ?></h1>
 
 	<div class="units-table js-units-container">