From 4af61a93e4b749b3fe1986957eb183bc6d39ca5b Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 08:54:18 +0200
Subject: [PATCH 01/28] Update install

---
 scripts/install | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/scripts/install b/scripts/install
index 85b9741..5636b1a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -123,19 +123,20 @@ chown -R $app:www-data "$final_path"
 #=================================================
 # CONFIGURE NODEBB
 #=================================================
+ynh_script_progression --message="Configuring the $app..." --weight=2
 
 setup="{
         \"url\": \"https://${domain}${path_url}\",
-        \"admin:username\": \"${admin}\",
-        \"admin:password\": \"${password}\",
-        \"admin:password:confirm\": \"${password}\",
-        \"admin:email\": \"admin@${domain}\",
+        \"admin:username\": \"$admin\",
+        \"admin:password\": \"$password\",
+        \"admin:password:confirm\": \"$password\",
+        \"admin:email\": \"admin@$domain\",
         \"database\": \"postgres\",
         \"postgres:host\": \"localhost\",
         \"postgres:port\": \"5432\",
-        \"postgres:username\": \"${db_name}\",
-        \"postgres:password\": \"${db_pwd}\",
-        \"postgres:database\": \"${db_name}\"
+        \"postgres:username\": \"$db_name\",
+        \"postgres:password\": \"$db_pwd\",
+        \"postgres:database\": \"$db_name\"
     }"
 
 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"

From 92a69cb0c0ded452e72b221fbc79d562705c88ea Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 09:44:25 +0200
Subject: [PATCH 02/28] Update install

---
 scripts/install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 5636b1a..e943ea8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -139,7 +139,9 @@ setup="{
         \"postgres:database\": \"$db_name\"
     }"
 
-ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
+#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
+
+cd $final_path && ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}"  --series
 
 #=================================================
 # NGINX CONFIGURATION

From a7caf598be7f8ee197b63080c07b8616e8db27bd Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 09:45:48 +0200
Subject: [PATCH 03/28] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index e943ea8..5e4dd25 100644
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ setup="{
 
 #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
 
-cd $final_path && ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}"  --series
+cd $final_path && ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}" --series | tee -a $install_log
 
 #=================================================
 # NGINX CONFIGURATION

From 3261ecd77c858865545a7fc17e4e1f6c51758df9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 09:48:08 +0200
Subject: [PATCH 04/28] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 5e4dd25..5908d1f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ setup="{
 
 #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
 
-cd $final_path && ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}" --series | tee -a $install_log
+ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}" --series | tee -a $install_log
 
 #=================================================
 # NGINX CONFIGURATION

From 39cb9d7640e1d569681b9d93835f44ca0ab9a1e2 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 09:48:50 +0200
Subject: [PATCH 05/28] Update install

---
 scripts/install | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 5908d1f..9105ef5 100644
--- a/scripts/install
+++ b/scripts/install
@@ -140,8 +140,9 @@ setup="{
     }"
 
 #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
-
-ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}" --series | tee -a $install_log
+pushd $final_path
+    ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}" --series | tee -a $install_log
+popd
 
 #=================================================
 # NGINX CONFIGURATION

From e40da31ace6129537c1494e36cbb0f39e1c1d957 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:07:39 +0200
Subject: [PATCH 06/28] Update install

---
 scripts/install | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/install b/scripts/install
index 9105ef5..e7473b8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -139,6 +139,10 @@ setup="{
         \"postgres:database\": \"$db_name\"
     }"
 
+pushd $final_path
+    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
+popd
+
 #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
 pushd $final_path
     ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}" --series | tee -a $install_log

From b6ac81c78a71512ae634bd6f27219a2b8d54b6a5 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:09:41 +0200
Subject: [PATCH 07/28] Fix

---
 conf/systemd.service | 4 ++--
 scripts/install      | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index d6b9562..78ac551 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -11,8 +11,8 @@ Group=__APP__
 Environment=NODE_ENV=production
 WorkingDirectory=__FINALPATH__/
 #PIDFile=__FINALPATH__/pidfile
-Environment="__YNH_NODE_LOAD_PATH__"
-ExecStart=__YNH_NODE__ __FINALPATH__/nodebb start
+Environment="__NODE_ENV_PATH__"
+ExecStart=__FINALPATH__/nodebb start
 #loader.js
 Restart=always
 
diff --git a/scripts/install b/scripts/install
index e7473b8..659e554 100644
--- a/scripts/install
+++ b/scripts/install
@@ -143,11 +143,6 @@ pushd $final_path
     ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
 popd
 
-#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
-pushd $final_path
-    ynh_exec_as $app env $ynh_node_load_PATH node $final_path/app --setup "${setup}" --series | tee -a $install_log
-popd
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -161,8 +156,6 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
-
 ynh_add_systemd_config
 
 #=================================================

From 0298ed79b39a398f4af34086d76ee70a27c3a188 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:15:55 +0200
Subject: [PATCH 08/28] Update install

---
 scripts/install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/install b/scripts/install
index 659e554..bd733c2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -156,6 +156,8 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
+ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
+
 ynh_add_systemd_config
 
 #=================================================

From fb9e3dde574917c466350d463c6450018626ca14 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:19:54 +0200
Subject: [PATCH 09/28] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index bd733c2..b3c6908 100644
--- a/scripts/install
+++ b/scripts/install
@@ -156,7 +156,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
+ynh_replace_string --match_string="__NODE_ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
 
 ynh_add_systemd_config
 

From fa440bc7ca29086e6925cbb41e45442587cedbec Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:23:59 +0200
Subject: [PATCH 10/28] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index b3c6908..bd733c2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -156,7 +156,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-ynh_replace_string --match_string="__NODE_ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
+ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
 
 ynh_add_systemd_config
 

From 97cc09ac111a9117858874c4f2dd2dca70c64fc6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:32:15 +0200
Subject: [PATCH 11/28] Update systemd.service

---
 conf/systemd.service | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 78ac551..d6b9562 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -11,8 +11,8 @@ Group=__APP__
 Environment=NODE_ENV=production
 WorkingDirectory=__FINALPATH__/
 #PIDFile=__FINALPATH__/pidfile
-Environment="__NODE_ENV_PATH__"
-ExecStart=__FINALPATH__/nodebb start
+Environment="__YNH_NODE_LOAD_PATH__"
+ExecStart=__YNH_NODE__ __FINALPATH__/nodebb start
 #loader.js
 Restart=always
 

From f95b4a09d09df9871ebd0211709296a6055529d8 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:59:18 +0200
Subject: [PATCH 12/28] Update install

---
 scripts/install | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/scripts/install b/scripts/install
index bd733c2..1c24fc7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -125,22 +125,26 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring the $app..." --weight=2
 
-setup="{
-        \"url\": \"https://${domain}${path_url}\",
-        \"admin:username\": \"$admin\",
-        \"admin:password\": \"$password\",
-        \"admin:password:confirm\": \"$password\",
-        \"admin:email\": \"admin@$domain\",
-        \"database\": \"postgres\",
-        \"postgres:host\": \"localhost\",
-        \"postgres:port\": \"5432\",
-        \"postgres:username\": \"$db_name\",
-        \"postgres:password\": \"$db_pwd\",
-        \"postgres:database\": \"$db_name\"
-    }"
+# setup="{
+#         \"url\": \"https://${domain}${path_url}\",
+#         \"admin:username\": \"$admin\",
+#         \"admin:password\": \"$password\",
+#         \"admin:password:confirm\": \"$password\",
+#         \"admin:email\": \"admin@$domain\",
+#         \"database\": \"postgres\",
+#         \"postgres:host\": \"localhost\",
+#         \"postgres:port\": \"5432\",
+#         \"postgres:username\": \"$db_name\",
+#         \"postgres:password\": \"$db_pwd\",
+#         \"postgres:database\": \"$db_name\"
+#     }"
+
+# pushd $final_path
+#     ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
+# popd
 
 pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
+    ynh_exec_as $app $ynh_node_load_PATH admin__password=$password node app --setup | tee -a $install_log
 popd
 
 #=================================================

From 9cd4d2ae6a5a9d17052f834c9294a0a4955bbd07 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 11:01:28 +0200
Subject: [PATCH 13/28] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 1c24fc7..35f7b7e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -144,7 +144,7 @@ ynh_script_progression --message="Configuring the $app..." --weight=2
 # popd
 
 pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH admin__password=$password node app --setup | tee -a $install_log
+    ynh_exec_as $app $ynh_node_load_PATH admin__password=$password ynh_node app --setup | tee -a $install_log
 popd
 
 #=================================================

From 5b81548a673ed81a8d68c88bef54e6cb55f77d7b Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 11:11:01 +0200
Subject: [PATCH 14/28] Update install

---
 scripts/install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 35f7b7e..172d78a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -139,14 +139,14 @@ ynh_script_progression --message="Configuring the $app..." --weight=2
 #         \"postgres:database\": \"$db_name\"
 #     }"
 
+pushd $final_path
+    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup admin__password=$password | tee -a $install_log
+popd
+
 # pushd $final_path
 #     ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
 # popd
 
-pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH admin__password=$password ynh_node app --setup | tee -a $install_log
-popd
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================

From c0aa94847425a860d2b3f6f7e37baf0ebda05f46 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 11:18:36 +0200
Subject: [PATCH 15/28] Update install

---
 scripts/install | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/scripts/install b/scripts/install
index 172d78a..bd733c2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -125,28 +125,24 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring the $app..." --weight=2
 
-# setup="{
-#         \"url\": \"https://${domain}${path_url}\",
-#         \"admin:username\": \"$admin\",
-#         \"admin:password\": \"$password\",
-#         \"admin:password:confirm\": \"$password\",
-#         \"admin:email\": \"admin@$domain\",
-#         \"database\": \"postgres\",
-#         \"postgres:host\": \"localhost\",
-#         \"postgres:port\": \"5432\",
-#         \"postgres:username\": \"$db_name\",
-#         \"postgres:password\": \"$db_pwd\",
-#         \"postgres:database\": \"$db_name\"
-#     }"
+setup="{
+        \"url\": \"https://${domain}${path_url}\",
+        \"admin:username\": \"$admin\",
+        \"admin:password\": \"$password\",
+        \"admin:password:confirm\": \"$password\",
+        \"admin:email\": \"admin@$domain\",
+        \"database\": \"postgres\",
+        \"postgres:host\": \"localhost\",
+        \"postgres:port\": \"5432\",
+        \"postgres:username\": \"$db_name\",
+        \"postgres:password\": \"$db_pwd\",
+        \"postgres:database\": \"$db_name\"
+    }"
 
 pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup admin__password=$password | tee -a $install_log
+    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
 popd
 
-# pushd $final_path
-#     ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
-# popd
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================

From da4d8e486718c37b57e7ed01fa8fdf09d448dc9d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 13:51:19 +0200
Subject: [PATCH 16/28] fix

---
 conf/config.json |  1 +
 scripts/install  | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/conf/config.json b/conf/config.json
index 3f3996a..59bca73 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -3,6 +3,7 @@
     "secret": "__SECRET__",
     "database": "postgres",
     "port": "__PORT__",
+    "bind_address": "127.0.0.1",
     "admin:username": "__ADMIN__",
     "admin:password": "__PASSWORD__",
     "admin:password:confirm": "__PASSWORD__",
diff --git a/scripts/install b/scripts/install
index bd733c2..c1175ff 100644
--- a/scripts/install
+++ b/scripts/install
@@ -126,23 +126,20 @@ chown -R $app:www-data "$final_path"
 ynh_script_progression --message="Configuring the $app..." --weight=2
 
 setup="{
-        \"url\": \"https://${domain}${path_url}\",
         \"admin:username\": \"$admin\",
         \"admin:password\": \"$password\",
         \"admin:password:confirm\": \"$password\",
         \"admin:email\": \"admin@$domain\",
-        \"database\": \"postgres\",
-        \"postgres:host\": \"localhost\",
-        \"postgres:port\": \"5432\",
-        \"postgres:username\": \"$db_name\",
-        \"postgres:password\": \"$db_pwd\",
-        \"postgres:database\": \"$db_name\"
     }"
 
 pushd $final_path
     ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
 popd
 
+ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
+chmod 400 "$final_path/config.json"
+chown $app:$app "$final_path/config.json"
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================

From 3b2661b5ce627b51df17d04763631f23dac289c7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 13:56:28 +0200
Subject: [PATCH 17/28] Update config.json

---
 conf/config.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/conf/config.json b/conf/config.json
index 59bca73..bf4b79d 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -4,10 +4,6 @@
     "database": "postgres",
     "port": "__PORT__",
     "bind_address": "127.0.0.1",
-    "admin:username": "__ADMIN__",
-    "admin:password": "__PASSWORD__",
-    "admin:password:confirm": "__PASSWORD__",
-    "admin:email": "admin@__DOMAIN__",
     "postgres": {
         "host": "localhost",
         "port": "5432",

From 547a6b9355817355494b31c3b55e0bdfa1f6129c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 14:00:06 +0200
Subject: [PATCH 18/28] Update install

---
 scripts/install | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install b/scripts/install
index c1175ff..ea4ed87 100644
--- a/scripts/install
+++ b/scripts/install
@@ -139,6 +139,9 @@ popd
 ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
 chmod 400 "$final_path/config.json"
 chown $app:$app "$final_path/config.json"
+pushd $final_path
+    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb upgrade
+popd
 
 #=================================================
 # NGINX CONFIGURATION

From b0c7c45113838a1832833c44febd02bcc5e09ea4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 14:00:26 +0200
Subject: [PATCH 19/28] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index ea4ed87..f3ca81b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -129,7 +129,7 @@ setup="{
         \"admin:username\": \"$admin\",
         \"admin:password\": \"$password\",
         \"admin:password:confirm\": \"$password\",
-        \"admin:email\": \"admin@$domain\",
+        \"admin:email\": \"admin@$domain\"
     }"
 
 pushd $final_path

From 72ee28b74ab4f5d8fe8de89461ad471b7c98da29 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 14:10:53 +0200
Subject: [PATCH 20/28] Update install

---
 scripts/install | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index f3ca81b..0732d30 100644
--- a/scripts/install
+++ b/scripts/install
@@ -125,6 +125,8 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring the $app..." --weight=2
 
+ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
+
 setup="{
         \"admin:username\": \"$admin\",
         \"admin:password\": \"$password\",
@@ -136,12 +138,8 @@ pushd $final_path
     ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
 popd
 
-ynh_add_config --template="../conf/config.json" --destination="$final_path/config.json"
 chmod 400 "$final_path/config.json"
 chown $app:$app "$final_path/config.json"
-pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb upgrade
-popd
 
 #=================================================
 # NGINX CONFIGURATION

From 7d02a2420610cd5800e20333559456af3294acc2 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 21 Sep 2021 23:58:41 +0200
Subject: [PATCH 21/28] Update manifest.json

---
 manifest.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index f2515c3..900ab46 100644
--- a/manifest.json
+++ b/manifest.json
@@ -32,8 +32,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -43,8 +42,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             },
             {
                 "name": "is_public",
@@ -53,8 +51,7 @@
             },
             {
                 "name": "password",
-                "type": "password",
-                "example": "Choose a password"
+                "type": "password"
             }
         ]
     }

From 92797f70d90cfcec115f0e69364c11b8bd64607e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 22 Sep 2021 19:04:45 +0200
Subject: [PATCH 22/28] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 900ab46..fe3882d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Forum software built for the modern web",
         "fr": "Logiciel de forum conçu pour le Web moderne"
     },
-    "version": "1.18.0~ynh1",
+    "version": "1.18.3~ynh1",
     "url": "https://nodebb.org",
     "upstream": {
         "license": "GPL-3.0",

From e1f361a92018b4d22b5f5c30102932f0aa0cf295 Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Wed, 22 Sep 2021 17:04:51 +0000
Subject: [PATCH 23/28] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 76c293d..214af27 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
 Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
 
-**Shipped version:** 1.18.0~ynh1
+**Shipped version:** 1.18.3~ynh1
 
 **Demo:** https://try.nodebb.org
 
diff --git a/README_fr.md b/README_fr.md
index 9baa6ae..f5f8527 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 NodeBB is built using the Node.js server-side Javascript platform, delivering unmatched performance.
 Building on this high performance platform means fast and dependable performance that will support even the biggest and most active community.
 
-**Version incluse :** 1.18.0~ynh1
+**Version incluse :** 1.18.3~ynh1
 
 **Démo :** https://try.nodebb.org
 

From a628a775903574f51b36d7d43a35ad1b0363a8ba Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 22 Sep 2021 22:13:23 +0200
Subject: [PATCH 24/28] Update check_process

---
 check_process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_process b/check_process
index 4206e96..50931a9 100644
--- a/check_process
+++ b/check_process
@@ -5,7 +5,7 @@
 		admin="john"
 		language="fr"
 		is_public=1
-		password="password"
+		password="password123456"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1

From 5447829e4163a2484742ad886324e7f4309524b4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 22 Sep 2021 23:04:42 +0200
Subject: [PATCH 25/28] Update upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 4921433..9e239ce 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -85,12 +85,12 @@ then
 
 	pushd $final_path
 		# Shut down your forum
-		./nodebb stop
+		ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb stop
 		# Grab the latest and greatest code
 		git fetch    								# Grab the latest code from the NodeBB Repository
 		git reset --hard origin/$nodebb_version		# Replace v1.12.x with the branch name!
 		# Run the NodeBB upgrade script
-		./nodebb upgrade
+		ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb upgrade
 	popd
 fi
 

From 6d53db1d302322c45d7984c9852b18b45611c63d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 22 Sep 2021 23:04:53 +0200
Subject: [PATCH 26/28] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 1ac9364..b0fe780 100644
--- a/scripts/install
+++ b/scripts/install
@@ -135,7 +135,7 @@ setup="{
     }"
 
 pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
+    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log 2>/dev/null 
 popd
 
 chmod 400 "$final_path/config.json"

From 620462cc055250d84879777a69fb1b587786c797 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 23 Sep 2021 07:40:23 +0200
Subject: [PATCH 27/28] fix

---
 scripts/install | 9 +++++----
 scripts/upgrade | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index b0fe780..444173d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -99,10 +99,10 @@ ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
 # Créer le dossier de log
 mkdir -p /var/log/$app
 touch /var/log/$app/$app.log
-install_log=/var/log/$app/installation.log
-touch $install_log
+#install_log=/var/log/$app/installation.log
+#touch $install_log
 chown $app -R /var/log/$app
-chown admin -R $install_log
+#chown admin -R $install_log
 
 # Configuration de logrotate
 ynh_use_logrotate
@@ -135,7 +135,8 @@ setup="{
     }"
 
 pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log 2>/dev/null 
+    ynh_use_nodejs
+    ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}" 2>/dev/null 
 popd
 
 chmod 400 "$final_path/config.json"
diff --git a/scripts/upgrade b/scripts/upgrade
index 9e239ce..2128358 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,8 +84,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	pushd $final_path
+		ynh_use_nodejs
 		# Shut down your forum
-		ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb stop
+		ynh_exec_as $app env "$ynh_node_load_PATH" $final_path/nodebb stop
 		# Grab the latest and greatest code
 		git fetch    								# Grab the latest code from the NodeBB Repository
 		git reset --hard origin/$nodebb_version		# Replace v1.12.x with the branch name!

From a69eca2353d4e4c771f27e7060418e90a035368d Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 23 Sep 2021 08:48:24 +0200
Subject: [PATCH 28/28] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 2128358..16c07fa 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -91,7 +91,7 @@ then
 		git fetch    								# Grab the latest code from the NodeBB Repository
 		git reset --hard origin/$nodebb_version		# Replace v1.12.x with the branch name!
 		# Run the NodeBB upgrade script
-		ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb upgrade
+		ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb upgrade 2>/dev/null 
 	popd
 fi