From 8b043e08a7ea9d774b9f00358bd8b70cc9ddae5e Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Thu, 8 Mar 2018 19:08:15 +0100
Subject: [PATCH 1/3] Fix stretch

---
 scripts/_common.sh | 32 +++++++++++++++++++-------------
 scripts/restore    |  4 ++++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 49a8a60..2eed000 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -24,41 +24,47 @@ ynh_add_fail2ban_config () {
   test -n "$logpath" || ynh_die "ynh_add_fail2ban_config expects a logfile path as first argument and received nothing."
   test -n "$failregex" || ynh_die "ynh_add_fail2ban_config expects a failure regex as second argument and received nothing."
   
-	finalfail2banjailconf="/etc/fail2ban/jail.d/$app.conf"
-	finalfail2banfilterconf="/etc/fail2ban/filter.d/$app.conf"
-	ynh_backup_if_checksum_is_different "$finalfail2banjailconf" 1
-	ynh_backup_if_checksum_is_different "$finalfail2banfilterconf" 1
+  finalfail2banjailconf="/etc/fail2ban/jail.d/$app.conf"
+  finalfail2banfilterconf="/etc/fail2ban/filter.d/$app.conf"
+  ynh_backup_if_checksum_is_different "$finalfail2banjailconf" 1
+  ynh_backup_if_checksum_is_different "$finalfail2banfilterconf" 1
   
-  cat > $finalfail2banjailconf <<EOF
+  sudo tee $finalfail2banjailconf <<EOF
 [$app]
 enabled = true
 port = $ports
 filter = $app
 logpath = $logpath
-maxretry = $max_retry" 
+maxretry = $max_retry
 EOF
 
-  cat > $finalfail2banfilterconf <<EOF
+  sudo tee $finalfail2banfilterconf <<EOF
 [INCLUDES]
 before = common.conf
 [Definition]
 failregex = $failregex
-ignoreregrex =" 
+ignoreregex =
 EOF
 
-	ynh_store_file_checksum "$finalfail2banjailconf"
-	ynh_store_file_checksum "$finalfail2banfilterconf"
+  ynh_store_file_checksum "$finalfail2banjailconf"
+  ynh_store_file_checksum "$finalfail2banfilterconf"
   
-	systemctl restart fail2ban
+  systemctl restart fail2ban
+  local fail2ban_error="$(journalctl -u fail2ban | tail -n50 | grep "WARNING.*$app.*")"
+  if [ -n "$fail2ban_error" ]
+  then
+    echo "[ERR] Fail2ban failed to load the jail for $app" >&2
+    echo "WARNING${fail2ban_error#*WARNING}" >&2
+  fi
 }
 
 # Remove the dedicated fail2ban config (jail and filter conf files)
 #
 # usage: ynh_remove_fail2ban_config
 ynh_remove_fail2ban_config () {
-	ynh_secure_remove "/etc/fail2ban/jail.d/$app.conf"
+  ynh_secure_remove "/etc/fail2ban/jail.d/$app.conf"
   ynh_secure_remove "/etc/fail2ban/filter.d/$app.conf"
-	systemctl restart fail2ban
+  sudo systemctl restart fail2ban
 }
 
 # Delete a file checksum from the app settings
diff --git a/scripts/restore b/scripts/restore
index d6f1dc9..fb0a658 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -89,6 +89,10 @@ chown -R $app: /home/yunohost.app/${app}
 #=================================================
 ynh_restore_file "/etc/fail2ban/jail.d/$app.conf"
 ynh_restore_file "/etc/fail2ban/filter.d/$app.conf"
+
+touch "/var/log/${app}FailedLogins.log"
+chown $app: "/var/log/${app}FailedLogins.log"
+
 systemctl restart fail2ban
 
 #=================================================

From 21bf9ed92cf445d1807f2cad8f1446b396b62bdf Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 15 Mar 2018 07:36:41 +0100
Subject: [PATCH 2/3] Upgrade to upstream version 2.9.3

---
 README.md     | 2 +-
 conf/app.src  | 5 ++---
 manifest.json | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7acf94f..dbefa27 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Piwigo for YunoHost
 
 Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and opensource.
 
-**Shipped version:** 2.9.2
+**Shipped version:** 2.9.3
 
 ![](http://piwigo.org/screenshots/homepage/piwigo-batch-manager.png)
 
diff --git a/conf/app.src b/conf/app.src
index 1a5b754..6e2da07 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,4 +1,3 @@
-SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.2
-SOURCE_SUM=344937dd1685efb41c1aa7301497aea0fb84707a6a9809eca9efb390d4eadb4a
+SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.3
+SOURCE_SUM=4022a743ddc0555f8d4f114ec3c3aa439eec44659cbf0d1564d0e3cc2ff30426
 SOURCE_FORMAT=zip
-
diff --git a/manifest.json b/manifest.json
index 1ced49b..f5d8366 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "photo gallery",
         "fr": "Galerie photo"
     },
-    "version": "2.9.2-2",
+    "version": "2.9.3~ynh1",
     "url": "http://piwigo.org",
     "license": "GPL-2.0",
     "maintainer": {

From 3fce0ac80ca576888734410d61dfbcd5279605f9 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Wed, 11 Apr 2018 21:01:26 +0200
Subject: [PATCH 3/3] Add upgrade from a previous commit

---
 check_process | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/check_process b/check_process
index 35a7b18..3e14e66 100644
--- a/check_process
+++ b/check_process
@@ -13,6 +13,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		upgrade=1	from_commit=f7a6d6ca2dbbd39f20d299478c28f92e83f6f53c
 		backup_restore=1
 		multi_instance=1
 		incorrect_path=1
@@ -33,4 +34,8 @@
   Level 10=0
 ;;; Options
 Email=
-Notification=none
\ No newline at end of file
+Notification=none
+;;; Upgrade options
+	; commit=f7a6d6ca2dbbd39f20d299478c28f92e83f6f53c
+		name=Take more official review comments into account
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&