From f18ea4c8088ad007544e7bbbe5e0e5648f3f061d Mon Sep 17 00:00:00 2001
From: Alexey Berezhok <a@bayrepo.ru>
Date: Sun, 5 Jan 2025 22:18:59 +0300
Subject: [PATCH] Added small fixs

---
 func_ruby/ext-modules/passenger_manager.mod | 6 +++---
 src/hst_autocompile.sh                      | 2 +-
 src/rpm/nginx/hestia-nginx.spec             | 2 +-
 src/rpm/php/hestia-php.spec                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/func_ruby/ext-modules/passenger_manager.mod b/func_ruby/ext-modules/passenger_manager.mod
index 2fa6094..9f59c4b 100644
--- a/func_ruby/ext-modules/passenger_manager.mod
+++ b/func_ruby/ext-modules/passenger_manager.mod
@@ -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)
diff --git a/src/hst_autocompile.sh b/src/hst_autocompile.sh
index c1a90bd..0cfd111 100755
--- a/src/hst_autocompile.sh
+++ b/src/hst_autocompile.sh
@@ -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
 }
 
diff --git a/src/rpm/nginx/hestia-nginx.spec b/src/rpm/nginx/hestia-nginx.spec
index 4ff0212..78e9662 100644
--- a/src/rpm/nginx/hestia-nginx.spec
+++ b/src/rpm/nginx/hestia-nginx.spec
@@ -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
diff --git a/src/rpm/php/hestia-php.spec b/src/rpm/php/hestia-php.spec
index 6419dd2..1fab0e4 100644
--- a/src/rpm/php/hestia-php.spec
+++ b/src/rpm/php/hestia-php.spec
@@ -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