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

Added small fixs

Browse Source
This commit is contained in:
Alexey Berezhok
2025-01-05 22:18:59 +03:00
parent dba200787f
commit f18ea4c808
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
begin begin
prepare_default_ruby_conf prepare_default_ruby_conf
log("install packages for passenger + nginx support: /usr/bin/puppet apply --detailed-exitcodes #{f_inst_pp}") log("install packages for passenger + nginx support: /usr/bin/puppet apply --detailed-exitcodes #{f_inst_pp}")
result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_inst_pp}"` result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_inst_pp} 2>&1"`
ex_status = $?.exitstatus ex_status = $?.exitstatus
if ex_status.to_i == 0 || ex_status.to_i == 2 if ex_status.to_i == 0 || ex_status.to_i == 2
log(result_action) log(result_action)
@@ -45,7 +45,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
else else
log(result_action) log(result_action)
log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}") log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}")
result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp}"` result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp} 2>&1"`
"module installation error. See log #{log_file}" "module installation error. See log #{log_file}"
end end
rescue => e rescue => e
@@ -64,7 +64,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
begin begin
log("uninstall packages for passenger + nginx support") log("uninstall packages for passenger + nginx support")
log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}") log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}")
result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp}"` result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp} 2>&1"`
ex_status = $?.exitstatus ex_status = $?.exitstatus
if ex_status.to_i == 0 || ex_status.to_i == 2 if ex_status.to_i == 0 || ex_status.to_i == 2
log(result_action) log(result_action)

2
src/hst_autocompile.sh
View File

@@ -79,7 +79,7 @@ get_branch_file() {
cp -f "$SRC_DIR/$filename" "$destination" cp -f "$SRC_DIR/$filename" "$destination"
fi fi
else else
download_file "https://raw.githubusercontent.com/$REPO/$branch/$filename" "$destination" $3 download_file "https://dev.brepo.ru/bayrepo/$REPO/raw/branch/$branch/$filename" "$destination" $3
fi fi
} }

2
src/rpm/nginx/hestia-nginx.spec
View File

@@ -7,7 +7,7 @@
Name: hestia-nginx Name: hestia-nginx
Version: 1.27.1 Version: 1.27.1
Release: 1%{dist} Release: 2%{dist}
Summary: Hestia internal nginx web server Summary: Hestia internal nginx web server
Group: System Environment/Base Group: System Environment/Base
URL: https://www.hestiacp.com URL: https://www.hestiacp.com

2
src/rpm/php/hestia-php.spec
View File

@@ -3,7 +3,7 @@
Name: hestia-php Name: hestia-php
Version: 8.2.23 Version: 8.2.23
Release: 1%{dist} Release: 2%{dist}
Summary: Hestia internal PHP Summary: Hestia internal PHP
Group: System Environment/Base Group: System Environment/Base
URL: https://www.hestiacp.com URL: https://www.hestiacp.com