From ef861e9c283d1075fa81fe59544a38af19680728 Mon Sep 17 00:00:00 2001
From: Alexey Berezhok <a@bayrepo.ru>
Date: Thu, 5 Sep 2024 21:35:47 +0300
Subject: [PATCH] Fixed firewall rules restoring on system reboot

---
 bin/v-update-firewall      | 2 +-
 src/rpm/hestia/hestia.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/v-update-firewall b/bin/v-update-firewall
index ef1bef3..c99650c 100755
--- a/bin/v-update-firewall
+++ b/bin/v-update-firewall
@@ -185,7 +185,7 @@ if [ -n "$FIREWALL_EXTENSION" ]; then
 fi
 
 # Clean up and saving rules to the master iptables file
-if [ -d "/etc/sysconfig" ]; then
+if [ -d "/etc/sysconfig" ] && [ ! -e /etc/redhat-release ]; then
 	/sbin/iptables-save | sed -e 's/[[0-9]\+:[0-9]\+]/[0:0]/g' -e '/^-A fail2ban-[A-Z]\+ -s .\+$/d' > /etc/sysconfig/iptables
 else
 	/sbin/iptables-save | sed -e 's/[[0-9]\+:[0-9]\+]/[0:0]/g' -e '/^-A fail2ban-[A-Z]\+ -s .\+$/d' > /etc/iptables.rules
diff --git a/src/rpm/hestia/hestia.spec b/src/rpm/hestia/hestia.spec
index 99b2b51..bd80bfe 100644
--- a/src/rpm/hestia/hestia.spec
+++ b/src/rpm/hestia/hestia.spec
@@ -2,8 +2,8 @@
 %global _hardened_build 1
 
 Name:              hestia
-Version:           1.8.5
-Release:           1%{dist}.bayrepo.1
+Version:           1.8.6
+Release:           1%{dist}
 Summary:           Hestia Control Panel
 Group:             System Environment/Base
 License:           GPLv3
@@ -179,6 +179,9 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Thu Sep 05 2024 Alexey Berezhok <a@bayrepo.ru> - 1.8.6-1
+- Fixed firewall rules restoring on system reboot
+
 * Fri Aug 30 2024 Alexey Berezhok <a@bayrepo.ru> - 1.8.5-1.bayrepo.1
 - Added php cli selector support
 - Move mo/po files local