diff --git a/ip6t-firewall-server b/ip6t-firewall-server index 900a6bd..100ec63 100755 --- a/ip6t-firewall-server +++ b/ip6t-firewall-server @@ -12,6 +12,10 @@ CONFIG_FILE=/etc/ipt-firewall/ip6t-firewall-server.conf +if [[ -z "$fail2ban_client" ]]; then + fail2ban_client="$(which fail2ban-client)" +fi + # ------------- Load Kernel Modules ------------- # @@ -98,9 +102,9 @@ fi # if ! $host_is_vm # ------------- Stop Fail2Ban if installed ------------- # -if [ -x "$fail2ban_init_script" ]; then +if [ -x "$fail2ban_client" ]; then echononl "\tStopping fail2ban.." - $fail2ban_init_script stop > /dev/null 2>&1 + $fail2ban_client stop > /dev/null 2>&1 if [ "$?" = "0" ];then echo_done else @@ -1360,10 +1364,10 @@ echo_done # ------------- Start Fail2Ban if installed # ------------- -if [ -x "$fail2ban_init_script" ]; then +if [ -x "$fail2ban_client" ]; then echo echononl "\tStarting fail2ban.." - $fail2ban_init_script start > /dev/null 2>&1 + $fail2ban_client start > /dev/null 2>&1 if [ "$?" = "0" ];then echo_done else diff --git a/ip6t-firewall-server.conf.sample b/ip6t-firewall-server.conf.sample index c1ae72b..720d3bf 100644 --- a/ip6t-firewall-server.conf.sample +++ b/ip6t-firewall-server.conf.sample @@ -13,7 +13,7 @@ # ------------- ip6t="/sbin/ip6tables" -fail2ban_init_script="" +fail2ban_client="$(which fail2ban-client)" # ------------- diff --git a/ipt-firewall-server b/ipt-firewall-server index 7e9efc0..ccfe005 100755 --- a/ipt-firewall-server +++ b/ipt-firewall-server @@ -12,6 +12,10 @@ CONFIG_FILE=/etc/ipt-firewall/ipt-firewall-server.conf +if [[ -z "$fail2ban_client" ]]; then + fail2ban_client="$(which fail2ban-client)" +fi + # ------------- Load Kernel Modules ------------- # @@ -177,9 +181,9 @@ fi # ------------- Stop Fail2Ban if installed ------------- # -if [ -x "$fail2ban_init_script" ]; then +if [ -x "$fail2ban_client" ]; then echononl "\tStopping fail2ban.." - $fail2ban_init_script stop > /dev/null 2>&1 + $fail2ban_client stop > /dev/null 2>&1 if [ "$?" = "0" ];then echo_done else @@ -1551,13 +1555,14 @@ echo_done # ------------- # ------------- Start Fail2Ban if installed # ------------- - -if [ -x "$fail2ban_init_script" ]; then +if [ -x "$fail2ban_client" ]; then echo echononl "\tStarting fail2ban.." - $fail2ban_init_script start > /dev/null 2>&1 + $fail2ban_client start > /dev/null 2>&1 if [ "$?" = "0" ];then echo_done + elif [ "$?" = "255" ]; then + echo_skipped else echo_failed fi diff --git a/ipt-firewall-server.conf.sample b/ipt-firewall-server.conf.sample index 0ee7d53..5e9d12b 100644 --- a/ipt-firewall-server.conf.sample +++ b/ipt-firewall-server.conf.sample @@ -13,7 +13,7 @@ # ------------- ipt="/sbin/iptables" -fail2ban_init_script="/etc/init.d/fail2ban" +fail2ban_client="$(which fail2ban-client)" # -------------