From be4bffb8db9468aeebb1e2509f8c68ebed8ac11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 21 Dec 2023 12:58:48 +0100
Subject: [PATCH 1/2] cleaning

---
 conf/systemd.service | 1 -
 manifest.toml        | 3 +++
 scripts/install      | 6 +++---
 scripts/upgrade      | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index c12d06e..b3707d3 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -10,7 +10,6 @@ WorkingDirectory=__INSTALL_DIR__
 Environment=PATH=__ENV_PATH__
 Environment=NODE_ENV=production
 ExecStart=__YNH_NPM__ start
-#ExecStart=__YNH_NPM__ __INSTALL_DIR__/server.js
 Restart=always
 RestartSec=2
 StandardOutput=journal
diff --git a/manifest.toml b/manifest.toml
index 4b0d389..5e6129f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -22,8 +22,11 @@ fund = "https://opencollective.com/cryptpad/contribute?language=fr"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "350M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index 511851e..8b01d42 100644
--- a/scripts/install
+++ b/scripts/install
@@ -34,7 +34,7 @@ fi
 
 ynh_app_setting_set --app=$app --key=sandboxdomain --value=$sandboxdomain
 
-ynh_script_progression --message="Setting up sandobx domain : $sandboxdomain" --weight=1
+ynh_script_progression --message="Setting up sandbox domain: $sandboxdomain" --weight=1
 
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
@@ -77,7 +77,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
-ynh_script_progression --message="Adding a configuration file..."
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 ynh_add_config --template="config.js" --destination="$install_dir/config/config.js"
 
@@ -102,7 +102,7 @@ popd
 ynh_script_progression --message="Starting a systemd service..." --weight=2
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/upgrade b/scripts/upgrade
index de80e47..c9a23e9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -29,7 +29,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -126,7 +126,7 @@ popd
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="server available"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available"
 
 #=================================================
 # COPY NGINX CONF IN SANDBOX DOMAIN

From a03f1ea947d6fb888d5658f3b476b5282c1dd181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 21 Dec 2023 13:07:41 +0100
Subject: [PATCH 2/2] cleaning

---
 scripts/change_url | 2 +-
 scripts/install    | 2 +-
 scripts/restore    | 2 +-
 scripts/upgrade    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 2e774f4..3a9b28d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -32,7 +32,7 @@ ynh_change_url_nginx_config
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/install b/scripts/install
index 8b01d42..273c164 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,7 +102,7 @@ popd
 ynh_script_progression --message="Starting a systemd service..." --weight=2
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/restore b/scripts/restore
index 717ab6e..c88954b 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -55,7 +55,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="server available"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 ynh_systemd_action --service_name=nginx --action=reload
 
diff --git a/scripts/upgrade b/scripts/upgrade
index c9a23e9..c7750d4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -126,7 +126,7 @@ popd
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
 
 #=================================================
 # COPY NGINX CONF IN SANDBOX DOMAIN