From 0b9fa59a65d3bca37eb3db93106e53c821504d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9rard=20Collin?= <gerard.collin@appliweb.net>
Date: Thu, 29 Dec 2022 10:06:46 +0100
Subject: [PATCH] Small corrections

---
 conf/systemd.service | 4 ++--
 manifest.json        | 3 ++-
 scripts/_common.sh   | 1 +
 scripts/remove       | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 2a2d5c1..0120242 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Mongo Express
-Wants=__MONGODB_SERVICENAME__.service
-After=network.target __MONGODB_SERVICENAME__.service
+After=network.target
+Requires=__MONGODB_SERVICENAME__.service
 
 [Service]
 Type=simple
diff --git a/manifest.json b/manifest.json
index bff1a02..1ba40d6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,7 +23,8 @@
     },
     "multi_instance": false,
     "services": [
-        "nginx"
+        "nginx",
+        "mongod"
     ],
     "arguments": {
         "install": [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index eb5e100..fc72584 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -2,6 +2,7 @@
 
 #=================================================
 # COMMON VARIABLES
+#=================================================
 nodejs_version=16
 
 # dependencies used by the app (must be on a single line)
diff --git a/scripts/remove b/scripts/remove
index c1711d6..a21fb8c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,10 +20,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 port=$(ynh_app_setting_get --app=$app --key=port)
 mongo_version=$(ynh_app_setting_get --app=$app --key=mongo_version)
-#db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-#db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-#datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
@@ -102,6 +99,9 @@ ynh_script_progression --message="Removing dependencies..." --weight=1
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
 
+# Remove the version of Nodejs used if needed
+ynh_remove_nodejs
+
 #=================================================
 # CLOSE A PORT
 #=================================================