From 559f97afa91c36d3907845cff974d480972c7143 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 16 Jul 2022 19:14:43 +0200
Subject: [PATCH] Upgrade to 3.2.2~ynh1

---
 check_process         | 5 +++--
 doc/DESCRIPTION.md    | 8 +++++++-
 doc/DESCRIPTION_fr.md | 5 +++++
 manifest.json         | 4 ++--
 scripts/install       | 2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 doc/DESCRIPTION_fr.md

diff --git a/check_process b/check_process
index 96ba5aa..5be5a1a 100644
--- a/check_process
+++ b/check_process
@@ -12,10 +12,11 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		# 3.1.1~ynh2
-		upgrade=1	from_commit=41cae71da176f9028ae5daa4ffcc349d9b16c47e
+		# 3.1.1~ynh3
+		upgrade=1	from_commit=0e91958cfd8406e71e9c4e506620c5e9b7110a5f
 		backup_restore=1
 		multi_instance=0
+		port_already_use=0
 		change_url=1
 ;;; Options
 Email=squeak@eauchat.org
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index e29a3aa..045a493 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1 +1,7 @@
-CouchDB is a database that completely embraces the web. Store your data with JSON documents. Access your documents with your web browser, via HTTP. Query, combine, and transform your documents with JavaScript. CouchDB works well with modern web and mobile apps. You can distribute your data, efficiently using CouchDB’s incremental replication. CouchDB supports master-master setups with automatic conflict detection.
\ No newline at end of file
+Couchdb is a database system, where entries are json objects (allowing attachments), and that you can access and synchronize via simple http requests.
+
+As explained in wikipedia:
+> Apache CouchDB is an open-source document-oriented NoSQL database, implemented in Erlang.
+
+And as described in the couchdb official website:
+> Seamless multi-master sync, that scales from Big Data to Mobile, with an Intuitive HTTP/JSON API and designed for Reliability.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..538bba2
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1,5 @@
+Couchdb est un gestionnaire de bases de données dans lesquelles les entrées sont des documents jsons (avec possibilité de pièces jointes), qui peuvent être manipulées par de simples requêtes http.
+
+Comme le présente wikipédia:
+> Apache CouchDB est un système de gestion de base de données orienté documents, écrit en langage Erlang et distribué sous licence Apache.
+> Conçu pour le Web, il fait partie de la mouvance NoSQL, et a été conçu pour pouvoir être réparti sur une grappe de serveurs.
diff --git a/manifest.json b/manifest.json
index 38a536f..6a9f51a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open-source document-oriented NoSQL database",
         "fr": "Système de gestion de base de données orienté documents"
     },
-    "version": "3.1.1~ynh3",
+    "version": "3.2.2~ynh1",
     "url": "https://couchdb.apache.org/",
     "upstream": {
         "license": "Apache-2.0",
@@ -29,7 +29,7 @@
         "nginx"
     ],
     "arguments": {
-        "install" : [
+        "install": [
             {
                 "name": "domain",
                 "type": "domain"
diff --git a/scripts/install b/scripts/install
index 29149f7..682b35b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -48,8 +48,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 ynh_app_setting_set --app=$app --key=password --value=$password
+ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 
 #=================================================
 # STANDARD MODIFICATIONS