Added small fixs

devel
Alexey Berezhok 3 months ago
parent dba200787f
commit f18ea4c808

@ -37,7 +37,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
begin
prepare_default_ruby_conf
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
if ex_status.to_i == 0 || ex_status.to_i == 2
log(result_action)
@ -45,7 +45,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
else
log(result_action)
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}"
end
rescue => e
@ -64,7 +64,7 @@ class PassengerWorker < Kernel::ModuleCoreWorker
begin
log("uninstall packages for passenger + nginx support")
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
if ex_status.to_i == 0 || ex_status.to_i == 2
log(result_action)

@ -79,7 +79,7 @@ get_branch_file() {
cp -f "$SRC_DIR/$filename" "$destination"
fi
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
}

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

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

Loading…
Cancel
Save