bayrepo/hestiacp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed passenger installation

Browse Source
This commit is contained in:
Alexey Berezhok
2025-01-02 17:18:21 +03:00
parent 56fab11941
commit dba200787f
5 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
func_ruby/ext-modules/passenger_manager.mod
View File

@@ -59,7 +59,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
log_file = get_log log_file = get_log
f_uninst_pp = get_module_paydata("passenger_uninstaller.pp") f_uninst_pp = get_module_paydata("passenger_uninstaller.pp")
if !check_domains_with_passenger 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 end
begin begin
log("uninstall packages for passenger + nginx support") log("uninstall packages for passenger + nginx support")

16
func_ruby/ext-modules/payload/passenger_manager/passenger_installer.pp
View File

@@ -1,39 +1,39 @@
package { package { 'rubygems-devel':
ensure => installed, ensure => installed,
name => 'rubygems-devel', name => 'rubygems-devel',
provider => 'dnf', provider => 'dnf',
} }
package { -> package { 'rubygem-rake':
ensure => installed, ensure => installed,
name => 'rubygem-rake', name => 'rubygem-rake',
provider => 'dnf', provider => 'dnf',
} }
package { -> package { 'ruby-devel':
ensure => installed, ensure => installed,
name => 'ruby-devel', name => 'ruby-devel',
provider => 'dnf', provider => 'dnf',
} }
package { -> package { 'rubygem-rack':
ensure => installed, ensure => installed,
name => 'rubygem-rack', name => 'rubygem-rack',
provider => 'dnf', provider => 'dnf',
} }
package { -> package { 'alt-brepo-ruby33-devel':
ensure => installed, ensure => installed,
name => 'alt-brepo-ruby33-devel', name => 'alt-brepo-ruby33-devel',
provider => 'dnf', provider => 'dnf',
} }
package { -> package { 'alt-brepo-ruby33-rubygem-rake':
ensure => installed, ensure => installed,
name => 'alt-brepo-ruby33-rubygem-rake', name => 'alt-brepo-ruby33-rubygem-rake',
provider => 'dnf', provider => 'dnf',
} }
package { -> package { 'passenger-devel':
ensure => installed, ensure => installed,
name => 'passenger-devel', name => 'passenger-devel',
provider => 'dnf', provider => 'dnf',
} }
package { 'passenger': -> package { 'passenger':
ensure => installed, ensure => installed,
name => 'passenger', name => 'passenger',
provider => 'dnf', provider => 'dnf',

7
func_ruby/ext-modules/payload/passenger_manager/passenger_uninstaller.pp
View File

@@ -1,8 +1,13 @@
package { 'nginx-passenger': package { 'nginx-mod-http-passenger':
ensure => absent, ensure => absent,
name => 'nginx-mod-http-passenger', name => 'nginx-mod-http-passenger',
provider => 'dnf', provider => 'dnf',
} }
-> package { 'passenger-devel':
ensure => absent,
name => 'passenger-devel',
provider => 'dnf',
}
-> package { 'passenger': -> package { 'passenger':
ensure => absent, ensure => absent,
name => 'passenger', name => 'passenger',

5
web/list/extmodules/index.php
View File

@@ -14,6 +14,11 @@ if ($_SESSION["userContext"] != "admin") {
exec(HESTIA_CMD . "v-ext-modules list json", $output, $return_var); exec(HESTIA_CMD . "v-ext-modules list json", $output, $return_var);
$data = json_decode(implode("", $output), true); $data = json_decode(implode("", $output), true);
ksort($data); ksort($data);
$error_message = "";
if (!empty($_SESSION["error_msg"])){
$error_message = $_SESSION["error_msg"];
$_SESSION["error_msg"] = "";
}
unset($output); unset($output);

12
web/templates/pages/extmodules.php
View File

@@ -12,6 +12,18 @@
<div class="container"> <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> <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"> <div class="units-table js-units-container">