From c148355c195a7694e0552e7fb1a9ebef27e4003d Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Tue, 28 Nov 2017 13:47:41 +0100
Subject: [PATCH] Change start/stop script for fail2ban.

---
 ip6t-firewall-vserver             | 12 ++++++++----
 ip6t-firewall-vserver.conf.sample |  2 +-
 ipt-firewall-vserver              | 12 ++++++++----
 ipt-firewall-vserver.conf.sample  |  2 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ip6t-firewall-vserver b/ip6t-firewall-vserver
index c69614c..88a4809 100755
--- a/ip6t-firewall-vserver
+++ b/ip6t-firewall-vserver
@@ -12,6 +12,10 @@
 
 CONFIG_FILE=/etc/ipt-firewall/ip6t-firewall-vserver.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
@@ -1370,10 +1374,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-vserver.conf.sample b/ip6t-firewall-vserver.conf.sample
index 382793a..0cb3190 100644
--- a/ip6t-firewall-vserver.conf.sample
+++ b/ip6t-firewall-vserver.conf.sample
@@ -13,7 +13,7 @@
 # -------------
 
 ip6t="/sbin/ip6tables"
-fail2ban_init_script=""
+l2ban_client="$(which fail2ban-client)"
 
 
 # -------------
diff --git a/ipt-firewall-vserver b/ipt-firewall-vserver
index 038b1b7..56e469d 100755
--- a/ipt-firewall-vserver
+++ b/ipt-firewall-vserver
@@ -12,6 +12,10 @@
 
 CONFIG_FILE=/etc/ipt-firewall/ipt-firewall-vserver.conf
 
+if [[ -z "$fail2ban_client" ]]; then
+   fail2ban_client="$(which fail2ban-client)"
+fi
+
 
 # ------------- Load Kernel Modules -------------
 #
@@ -189,9 +193,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
@@ -1565,10 +1569,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/ipt-firewall-vserver.conf.sample b/ipt-firewall-vserver.conf.sample
index fa5cb99..d991ff2 100644
--- a/ipt-firewall-vserver.conf.sample
+++ b/ipt-firewall-vserver.conf.sample
@@ -13,7 +13,7 @@
 # -------------
 
 ipt="/sbin/iptables"
-fail2ban_init_script="/etc/init.d/fail2ban"
+fail2ban_client="$(which fail2ban-client)"
 
 
 # -------------