From 80bdf83420a37a773c4ba7510d8a2f4acaaabe99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 28 Dec 2023 21:03:26 +0100
Subject: [PATCH] cleaning

---
 conf/nginx.conf |  1 +
 doc/ADMIN_fr.md |  2 +-
 doc/ADMIn.md    |  2 +-
 manifest.toml   |  6 +++---
 scripts/remove  | 16 +---------------
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index e89a443..861e68e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,3 +1,4 @@
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
 
   proxy_pass        http://127.0.0.1:__PORT__/;
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 5470e72..955f6b0 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,3 +1,3 @@
 ## Configuration
 
-Vous pouvez effectuer la plupart des configurations de CouchDB à partir de fauxton, l'interface Web, accessible sur le domaine que vous avez spécifié : `https://domain.tld/_utils/index.html`
+Vous pouvez effectuer la plupart des configurations de CouchDB à partir de fauxton, l'interface Web, accessible sur le domaine que vous avez spécifié : `https://__DOMAIN____PATH__/_utils/index.html`
diff --git a/doc/ADMIn.md b/doc/ADMIn.md
index 3d835fd..92e33bd 100644
--- a/doc/ADMIn.md
+++ b/doc/ADMIn.md
@@ -1,3 +1,3 @@
 ## Configuration
 
-You can do most configuration of CouchDB from fauxton, the web interface, accessible at the domain you specified: `https://domain.tld/_utils/index.html`
+You can do most configuration of CouchDB from fauxton, the web interface, accessible at the domain you specified: `https://__DOMAIN____PATH__/_utils/index.html`
diff --git a/manifest.toml b/manifest.toml
index 1bc766a..7e8d29c 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -22,19 +22,20 @@ cpe = "cpe:2.3:a:apache:couchdb"
 yunohost = ">= 11.1"
 architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"]
 multi_instance = false
+
 ldap = "not_relevant"
+
 sso = "not_relevant"
+
 disk = "20M"
 ram.build = "150M"
 ram.runtime = "60M"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
 
     [install.path]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "path"
     default = "/couch"
 
@@ -43,7 +44,6 @@ ram.runtime = "60M"
     default = "visitors"
 
     [install.password]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "password"
 
 [resources]
diff --git a/scripts/remove b/scripts/remove
index 681116d..469ef62 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,6 +14,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=5
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
@@ -22,27 +23,12 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# REMOVE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --weight=1
-
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2
-
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE FAIL2BAN CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=2
-
 # Remove the dedicated Fail2Ban config
 ynh_remove_fail2ban_config