Added fixes
This commit is contained in:
@@ -1,8 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# info: update system firewall rules
|
# info: update system firewall rules
|
||||||
# options: NEED_IPT_SWITCH
|
# options: no opts
|
||||||
# if first parameter set and it's value is iptables
|
|
||||||
# for rpm system, then need to activate iptables
|
|
||||||
#
|
#
|
||||||
# example: v-update-firewall
|
# example: v-update-firewall
|
||||||
#
|
#
|
||||||
@@ -11,7 +9,6 @@
|
|||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
# Variables & Functions #
|
# Variables & Functions #
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
need_ipt_switch="$1"
|
|
||||||
|
|
||||||
# Defining absolute path for iptables and modprobe
|
# Defining absolute path for iptables and modprobe
|
||||||
iptables="/sbin/iptables"
|
iptables="/sbin/iptables"
|
||||||
@@ -39,15 +36,6 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM'
|
|||||||
# Action #
|
# Action #
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
if [ -f /etc/redhat-release ] && [ "$need_ipt_switch" = "iptables" ]; then
|
|
||||||
# Revert from nftables to iptables only first time
|
|
||||||
systemctl stop firewalld
|
|
||||||
systemctl disable firewalld
|
|
||||||
dnf erase nftables -y
|
|
||||||
dnf install iptables-legacy iptables-legacy-libs iptables-services iptables-utils ipset -y
|
|
||||||
systemctl enable iptables --now
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Self heal iptables links
|
# Self heal iptables links
|
||||||
heal_iptables_links
|
heal_iptables_links
|
||||||
|
|
||||||
|
|||||||
@@ -899,6 +899,17 @@ fi
|
|||||||
# Install packages #
|
# Install packages #
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
|
if [ "$iptables" = 'yes' ]; then
|
||||||
|
if [ -f /etc/redhat-release ]; then
|
||||||
|
# Revert from nftables to iptables only first time
|
||||||
|
systemctl stop firewalld
|
||||||
|
systemctl disable firewalld
|
||||||
|
dnf erase nftables -y
|
||||||
|
dnf install iptables-legacy iptables-legacy-libs iptables-services iptables-utils ipset -y
|
||||||
|
systemctl enable iptables --now
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Installing rpm packages
|
# Installing rpm packages
|
||||||
echo "The installer is now downloading and installing all required packages."
|
echo "The installer is now downloading and installing all required packages."
|
||||||
echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
|
echo -ne "NOTE: This process may take 10 to 15 minutes to complete, please wait... "
|
||||||
@@ -1877,7 +1888,7 @@ local_ip="$primary_ipv4"
|
|||||||
|
|
||||||
# Configuring firewall
|
# Configuring firewall
|
||||||
if [ "$iptables" = 'yes' ]; then
|
if [ "$iptables" = 'yes' ]; then
|
||||||
$HESTIA/bin/v-update-firewall iptables
|
$HESTIA/bin/v-update-firewall
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get public IP
|
# Get public IP
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ maxretry = 5
|
|||||||
enabled = true
|
enabled = true
|
||||||
filter = hestia
|
filter = hestia
|
||||||
action = hestia[name=HESTIA]
|
action = hestia[name=HESTIA]
|
||||||
logpath = /var/log/hestia/secure
|
logpath = /var/log/messages
|
||||||
maxretry = 5
|
maxretry = 5
|
||||||
|
|
||||||
[roundcube-auth]
|
[roundcube-auth]
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ Alias /%pma_alias% /usr/share/phpmyadmin
|
|||||||
</IfDefine>
|
</IfDefine>
|
||||||
<IfDefine !PHP_ENABLED>
|
<IfDefine !PHP_ENABLED>
|
||||||
<FilesMatch \.php$>
|
<FilesMatch \.php$>
|
||||||
SetHandler "proxy:unix:/run/hestia-php.sock|fcgi://localhost"
|
#SetHandler "proxy:unix:/run/hestia/php.sock|fcgi://localhost"
|
||||||
|
SetHandler "proxy:fcgi://127.0.0.1:9000"
|
||||||
</FilesMatch>
|
</FilesMatch>
|
||||||
</IfDefine>
|
</IfDefine>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user