From 053b99eba69dbfafb5c98b2506274e09df492c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 2 Sep 2024 17:10:31 +0200
Subject: [PATCH] cleaning

---
 manifest.toml   |  2 +-
 scripts/install |  7 -------
 scripts/restore |  4 ----
 scripts/upgrade | 14 +-------------
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 1907c83..d9acc9e 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,7 +19,7 @@ userdoc = "https://jitsi.org/user-faq/"
 code = "https://github.com/jitsi/jitsi-meet"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.29"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = false
diff --git a/scripts/install b/scripts/install
index 7b2cd3f..42baa5e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -43,9 +43,6 @@ ynh_script_progression "Setting up source files..."
 
 _setup_sources
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 750 "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir"
 #=================================================
 # REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE IN JITSI-VIDEOBRIDGE
 #=================================================
@@ -119,7 +116,6 @@ ynh_script_progression "Configuring Jitsi-Meet..."
 mkdir -p "/etc/$app/meet"
 
 ynh_config_add --template="jitsi-meet-config.js" --destination="/etc/$app/meet/$domain-config.js"
-#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 644 "/etc/$app/meet/$domain-config.js"
 
 #=================================================
 # SECURE FILES AND DIRECTORIES
@@ -147,9 +143,6 @@ yunohost service add "$app-jicofo" --log "/var/log/$app/$app-jicofo.log"
 # Use logrotate to manage application logfile(s)
 ynh_config_add_logrotate
 
-#REMOVEME? Assuming ynh_config_add_logrotate is called, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:" "/var/log/$app"
-#REMOVEME? Assuming ynh_config_add_logrotate is called, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R 770 "/var/log/$app"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index c26deb7..aa7ea97 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -21,9 +21,6 @@ ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 750 "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir"
 #=================================================
 # CONFIGURE PROSODY
 #=================================================
@@ -72,7 +69,6 @@ ynh_restore "/etc/logrotate.d/$app"
 #=================================================
 
 ynh_restore "/etc/$app/"
-#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 644 "/etc/$app/meet/$domain-config.js"
 
 ynh_restore "/var/log/$app/"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8728fdb..ab8cc42 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -16,12 +16,7 @@ ynh_systemctl --service="$app-jicofo" --action="stop" --log_path="/var/log/$app/
 #=================================================
 ynh_script_progression "Ensuring downward compatibility..."
 
-# If max_memory doesn't exist, create it and set to default 75 mb value
-# FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=max_memory --value=200
-if [ -z "${max_memory:-}" ]; then
-    max_memory=200
-    ynh_app_setting_set --key=max_memory --value="$max_memory"
-fi
+ynh_app_setting_set_default --key=max_memory --value=200
 
 gpasswd --add prosody "$app"
 gpasswd --add www-data "$app"
@@ -33,9 +28,6 @@ ynh_script_progression "Upgrading source files..."
 
 _setup_sources
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 750 "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:$app" "$install_dir"
 #=================================================
 # REPLACE JNIWRAPPER FOR ARMHF ARCHITECTURE IN JITSI-VIDEOBRIDGE
 #=================================================
@@ -82,7 +74,6 @@ ynh_config_add --template="jitsi-jicofo-logging.properties" --destination="/etc/
 ynh_script_progression "Configuring Jitsi-Meet..."
 
 ynh_config_add --template="jitsi-meet-config.js" --destination="/etc/$app/meet/$domain-config.js"
-#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 644 "/etc/$app/meet/$domain-config.js"
 
 #=================================================
 # SECURE FILES AND DIRECTORIES
@@ -110,9 +101,6 @@ yunohost service add "$app-jicofo" --log "/var/log/$app/$app-jicofo.log"
 # Use logrotate to manage app-specific logfile(s)
 ynh_config_add_logrotate
 
-#REMOVEME? Assuming ynh_config_add_logrotate is called, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:" "/var/log/$app"
-#REMOVEME? Assuming ynh_config_add_logrotate is called, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R 770 "/var/log/$app"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================