From adaf8c0edb22c462df22d5e5951d3f5660472289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 13 Dec 2021 23:32:30 +0100
Subject: [PATCH] Testing (#17)

* 1.2.6.3
---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/app.src    | 4 ++--
 conf/nginx.conf | 5 -----
 manifest.json   | 4 ++--
 scripts/restore | 3 +--
 6 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 713bd03..6ec9473 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers.
 
-**Shipped version:** 1.2.6.2~ynh3
+**Shipped version:** 1.2.6.3~ynh1
 
 **Demo:** https://olddemo.phpldapadmin.org/
 
diff --git a/README_fr.md b/README_fr.md
index ce9cadd..21f3c1d 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 phpLDAPadmin is a web app for administering Lightweight Directory Access Protocol (LDAP) servers.
 
-**Version incluse :** 1.2.6.2~ynh3
+**Version incluse :** 1.2.6.3~ynh1
 
 **Démo :** https://olddemo.phpldapadmin.org/
 
diff --git a/conf/app.src b/conf/app.src
index 9c69386..4ffd88a 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/leenooks/phpLDAPadmin/archive/1.2.6.2.tar.gz
-SOURCE_SUM=49b14019bf611267720b4e9de33f2502b44c526809f17225a4a76ee8296b8d64
+SOURCE_URL=https://github.com/leenooks/phpLDAPadmin/archive/1.2.6.3.tar.gz
+SOURCE_SUM=718f805403279f8e54caa1046b5f43c989e3bce82c408d22d349b5393e4a2cea
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/nginx.conf b/conf/nginx.conf
index e882cc5..6d8ad6b 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
   
   try_files $uri $uri/ index.php;
diff --git a/manifest.json b/manifest.json
index 41e1767..bbfdbff 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Manage OpenLDAP database over the web",
         "fr": "Application web de gestion de la base OpenLDAP"
     },
-    "version": "1.2.6.2~ynh3",
+    "version": "1.2.6.3~ynh1",
     "url": "http://www.phpldapadmin.org",
     "upstream": {
         "license": "GPL-2.0-or-later",
@@ -21,7 +21,7 @@
         "email": "aymhce@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/restore b/scripts/restore
index 88535a6..5241b00 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -35,8 +35,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS