From 9ab6ff9c6d5db1818edefb21e2fc3ad19d66d542 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Thu, 4 Jan 2018 19:28:09 +0100
Subject: [PATCH] Fix upgrade from

---
 check_process      | 6 +++---
 scripts/_common.sh | 5 +++++
 scripts/remove     | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index bd23592..6d00657 100644
--- a/check_process
+++ b/check_process
@@ -11,7 +11,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=a8a843c80846eced71edb4f62f4b2981578751e2
+		upgrade=1	from_commit=a1211123350ae50675d4f37074d2953939e55dff
 		backup_restore=1
 		multi_instance=0
 		incorrect_path=1
@@ -34,6 +34,6 @@
 Email=
 Notification=down
 ;;; Upgrade options
-	; commit=a8a843c80846eced71edb4f62f4b2981578751e2
-		name=5 Sep 2017 a8a843c80846eced71edb4f62f4b2981578751e2
+	; commit=a1211123350ae50675d4f37074d2953939e55dff
+		name=21 Dec 2017 a1211123350ae50675d4f37074d2953939e55dff
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 522fde5..746baa4 100755
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -454,6 +454,11 @@ EOF
 	ynh_store_file_checksum "$finalfail2banfilterconf"
 
 	sudo systemctl restart fail2ban
+	if local fail2ban_error="$(tail -n50 /var/log/fail2ban.log | grep "WARNING Command.*$app.*addfailregex")"
+	then
+		echo "[ERR] Fail2ban fail to load the jail for $app" >&2
+		echo "WARNING${fail2ban_error#*WARNING}" >&2
+	fi
 }
 
 # Remove the dedicated fail2ban config (jail and filter conf files)
diff --git a/scripts/remove b/scripts/remove
index acbd014..5b6ae3b 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -35,6 +35,7 @@ fi
 
 ynh_apt purge jenkins
 ynh_remove_app_dependencies
+ynh_secure_remove "/var/lib/jenkins"
 
 #=================================================
 # REMOVE THE NGINX CONFIGURATION