From 51a798ffd6c7256ccc25adf292e26a8c7ffea854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 24 May 2024 08:26:56 +0200
Subject: [PATCH 1/4] cleaning

---
 manifest.toml   |  2 +-
 scripts/backup  |  8 +-------
 scripts/install |  1 -
 scripts/remove  |  5 -----
 scripts/upgrade | 38 ++++++++++++--------------------------
 5 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 3db19dc..766b225 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,7 +19,7 @@ cpe = "cpe:2.3:a:xwiki:cryptpad"
 fund = "https://opencollective.com/cryptpad/contribute?language=fr"
 
 [integration]
-yunohost = ">= 11.1.21"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
 ldap = false
diff --git a/scripts/backup b/scripts/backup
index 7189d8c..38d96c5 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -22,17 +22,11 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================
diff --git a/scripts/install b/scripts/install
index 5be5342..a9721e6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -68,7 +68,6 @@ ynh_script_progression --message="Adding system configurations related to $app..
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-env_path="$PATH"
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
diff --git a/scripts/remove b/scripts/remove
index dbc0282..a7f6a3e 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -29,11 +29,6 @@ ynh_remove_systemd_config
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=3
-
 ynh_remove_nodejs
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index e55c805..8f85586 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,10 +17,11 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 email=$(ynh_user_get_info --username=$admin --key=mail)
 
 #=================================================
-# CHECK VERSION
+# UPGRADE DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=6
 
-upgrade_type=$(ynh_check_app_version_changed)
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
 # STANDARD UPGRADE STEPS
@@ -34,17 +35,13 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" #--keep="config/config.js"
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" #--keep="config/config.js"
 	
-	chmod -R o-rwx "$install_dir"
-	chown -R $app:$app "$install_dir"
-fi
+chmod -R o-rwx "$install_dir"
+chown -R $app:$app "$install_dir"
 
 #=================================================
 # APPLY FOLDER GROUP RIGHTS FOR WWW-DATA
@@ -88,13 +85,10 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-env_path="$PATH"
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=6
+# Create a dedicated systemd config
+ynh_add_systemd_config
 
-ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
+yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log"
 
 #=================================================
 # INSTALL CRYPTPAD
@@ -109,20 +103,12 @@ pushd "$install_dir"
 	ynh_exec_warn_less npm run build
 popd
 
-#=================================================
-# CREATE SYSTEMD SERVICE
-#=================================================
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log"
-
 #=================================================
 # ADD UPGRADED CONFIG WITH SANDBOX
 #=================================================
 ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config.js" --destination="$install_dir/config/config.js"
+ynh_add_config --template="config.js" --destination="$install_dir/config/config.js"
 
 chmod 600 "$install_dir/config/config.js"
 chown $app "$install_dir/config/config.js"

From 2d6d49004a06bfc256fa77d4d5212796b17ab077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 24 May 2024 08:28:30 +0200
Subject: [PATCH 2/4] cleaning

---
 doc/ADMIN.md        | 2 +-
 doc/ADMIN_fr.md     | 2 +-
 doc/POST_INSTALL.md | 2 +-
 doc/POST_UPGRADE.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 697dfd8..92e089f 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -3,7 +3,7 @@ We have added the mandatory sandbox domain for you but you still need to configu
 Once CryptPad is installed, create an account via the Register button on the home page. To make this account an instance administrator:
 
 1. Copy the public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key
-2. Paste this key in `/var/www/cryptpad/config/config.js` in the following array (uncomment and replace the placeholder):
+2. Paste this key in `__INSTALL_DIR__/config/config.js` in the following array (uncomment and replace the placeholder):
 ``` 
 adminKeys: [
         "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]",
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index b349804..0181737 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -5,7 +5,7 @@ Nous avons ajouté le domaine obligatoire sandbox pour vous mais vous devez enco
 Une fois CryptPad installé, créez un compte via le bouton S'inscrire sur la page d'accueil. Pour faire de ce compte un administrateur d'instance :
 
 1. Copiez la clé publique trouvée dans le menu utilisateur (avatar en haut à droite) > Paramètres > Compte > Clé de signature publique
-2. Collez cette clé dans `/var/www/cryptpad/config/config.js` dans le tableau suivant (décommentez et remplacez l'espace réservé) :
+2. Collez cette clé dans `__INSTALL_DIR__/config/config.js` dans le tableau suivant (décommentez et remplacez l'espace réservé) :
 ``` 
 adminKeys: [
         "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]",
diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md
index 9c530ab..72e066f 100644
--- a/doc/POST_INSTALL.md
+++ b/doc/POST_INSTALL.md
@@ -7,7 +7,7 @@ Once CryptPad is installed, create an account via the Sign Up button on the home
 To make this account an instance administrator:
 
 1. Copy the public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key
-2. Paste this key in `/var/www/cryptpad/config/config.js` in the following array (uncomment and replace the placeholder):
+2. Paste this key in `__INSTALL_DIR__/config/config.js` in the following array (uncomment and replace the placeholder):
 
 ```
 adminKeys: [
diff --git a/doc/POST_UPGRADE.md b/doc/POST_UPGRADE.md
index 6023335..03604fb 100644
--- a/doc/POST_UPGRADE.md
+++ b/doc/POST_UPGRADE.md
@@ -3,7 +3,7 @@ If not already done, then you can please open CryptPad domain: https://__DOMAIN_
 
 Create an account via the Register button on the home page. To make this account an instance administrator:
 1. Copy the public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key
-2. Paste this key in /var/www/cryptpad/config/config.js in the following array (uncomment and replace the placeholder):
+2. Paste this key in __INSTALL_DIR__/config/config.js in the following array (uncomment and replace the placeholder):
 adminKeys: [
         "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]",
 ],

From 459cd6781843f598c4e69993a9330ea776b988bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 24 May 2024 08:29:20 +0200
Subject: [PATCH 3/4] Update install

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

diff --git a/scripts/install b/scripts/install
index a9721e6..5c064c3 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 sandobx domain: $sandboxdomain" --weight=1
 
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
@@ -76,9 +76,9 @@ 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="../conf/config.js" --destination="$install_dir/config/config.js"
+ynh_add_config --template="config.js" --destination="$install_dir/config/config.js"
 
 chmod 600 "$install_dir/config/config.js"
 chown $app "$install_dir/config/config.js"

From e2f9b144591e28a5961a7a1d15a9ea0f93bd01ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 24 May 2024 08:29:52 +0200
Subject: [PATCH 4/4] Update manifest.toml

---
 manifest.toml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/manifest.toml b/manifest.toml
index 766b225..dec6f5e 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"