From 642fdfe99195bf507bbbf0d5f90541bdbdbb6f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 27 Feb 2023 19:21:55 +0100
Subject: [PATCH] fix

---
 manifest.toml   |  5 +++++
 scripts/install | 18 ++++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 94c8a8a..b66b940 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -54,5 +54,10 @@ ram.runtime = "50M"
     [resources.apt]
     packages = "postgresql"
 
+    # (this part is optional and corresponds to the legacy ynh_install_extra_app_dependencies helper)
+    extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
+    extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"
+    extras.yarn.packages = "yarn"
+
     [resources.database]
     type = "postgresql"
diff --git a/scripts/install b/scripts/install
index 9dff048..2cddc46 100644
--- a/scripts/install
+++ b/scripts/install
@@ -50,21 +50,18 @@ chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
+ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
-
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
+yunohost service add $app --description="Collaborative Markdown editor" --log="/var/log/$app/$app.log"
+
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
@@ -76,13 +73,6 @@ ynh_add_config --template="../conf/config.json.example" --destination="$install_
 chmod 600 "$install_dir/config.json"
 chown $app:$app "$install_dir/config.json"
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
-
-yunohost service add $app --description="Collaborative Markdown editor" --log="/var/log/$app/$app.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================