From d069d8ff8d46fba11328c4d7e78292c2d357983c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 12 Jan 2024 21:21:27 +0100
Subject: [PATCH] fix

---
 manifest.toml      |  8 +++++---
 scripts/change_url |  2 +-
 scripts/remove     | 24 ------------------------
 scripts/upgrade    |  2 +-
 4 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index bc6001c..56a0a43 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,11 +17,14 @@ userdoc = "https://docs.joinmobilizon.org"
 code = "https://framagit.org/framasoft/mobilizon/"
 
 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
+
 ldap = true
+
 sso = true
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@@ -29,7 +32,6 @@ ram.runtime = "50M"
 [install]
     [install.domain]
     type = "domain"
-    full_domain = true
 
     [install.init_main_permission]
     type = "group"
@@ -72,7 +74,7 @@ ram.runtime = "50M"
     api.protected = true
 
     [resources.apt]
-    packages = "postgresql postgresql-client postgresql-contrib postgis postgresql-postgis-scripts postgresql-13-postgis-3 argon2 imagemagick webp gifsicle jpegoptim optipng pngquant file"
+    packages = "postgresql, postgresql-client, postgresql-contrib, postgis, postgresql-postgis-scripts, postgresql-13-postgis-3, argon2, imagemagick, webp, gifsicle, jpegoptim, optipng, pngquant, file"
 
     [resources.database]
     type = "postgresql"
diff --git a/scripts/change_url b/scripts/change_url
index e1102fb..09883ee 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped"
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd
 
 #=================================================
 # MODIFY URL IN NGINX CONF
diff --git a/scripts/remove b/scripts/remove
index e070e94..807ecac 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -22,42 +22,18 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..."
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..."
-
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing various files..."
-
 # Remove a directory securely
 ynh_secure_remove --file="/etc/$app"
 
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..."
-
 yunohost user delete ${app}_notifs
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 6084a32..fdc44b4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -26,7 +26,7 @@ previous_version="${version}"
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped"
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY