cleaning

6 files changed, 10 insertions, 28 deletions

diff --git a/manifest.toml b/manifest.toml
index 7f0b634..3575af5 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -25,7 +25,6 @@ architectures = "all"
 multi_instance = true
 
 ldap = true
-
 sso = false
 
 disk = "2G"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 182e391..acc9c4b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,8 +5,8 @@
 #=================================================
 
 memory_needed="2560"
-ruby_version=3.4.5
-nodejs_version=20
+ruby_version="3.4.5"
+nodejs_version="20"
 
 case $YNH_ARCH in
 	amd64)
diff --git a/scripts/remove b/scripts/remove
index 297786f..d2c0cb5 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -7,26 +7,18 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-# REMOVE SYSTEMD SERVICE
-#=================================================
 ynh_script_progression "Removing system configurations related to $app..."
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
-if ynh_hide_warnings yunohost service status "$app-web" >/dev/null
-then
-	ynh_script_progression "Removing $app-web service integration..."
+if ynh_hide_warnings yunohost service status "$app-web" >/dev/null; then
 	yunohost service remove "$app-web"
 fi
 
-if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null
-then
-	ynh_script_progression "Removing $app-sidekiq service integration..."
+if ynh_hide_warnings yunohost service status "$app-sidekiq" >/dev/null; then
 	yunohost service remove "$app-sidekiq"
 fi
 
-if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null
-then
-	ynh_script_progression "Removing $app-streaming service integration..."
+if ynh_hide_warnings yunohost service status "$app-streaming" >/dev/null; then
 	yunohost service remove "$app-streaming"
 fi
 
diff --git a/scripts/restore b/scripts/restore
index 0becd6c..03f0dce 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,8 +6,6 @@ source ../settings/scripts/ynh_add_swap
 source /usr/share/yunohost/helpers
 
 #=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression "Restoring the app main directory..."
@@ -61,8 +59,6 @@ popd
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
 ynh_script_progression "Restoring system configurations related to $app..."
 
 ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
diff --git a/scripts/upgrade b/scripts/upgrade
index 769b47c..3b8f6e8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -16,11 +16,11 @@ fi
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-
 ynh_script_progression "Stopping $app's systemd service..."
-	ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye"
-	ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye"
-	ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log
+
+ynh_systemctl --service=${app}-web --action="stop" --log_path=/var/log/$app/$app-web.log --wait_until="Goodbye"
+ynh_systemctl --service=${app}-sidekiq --action="stop" --log_path=/var/log/$app/$app-sidekiq.log --wait_until="Bye"
+ynh_systemctl --service=${app}-streaming --action="stop" --log_path=/var/log/$app/$app-streaming.log
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -55,11 +55,8 @@ ynh_ruby_install
 ynh_nodejs_install
 
 #=================================================
-# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...)
-#=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-
 ynh_script_progression "Upgrading source files..."
 
 # Download, check integrity, uncompress and patch the source from manifest.toml
@@ -115,8 +112,6 @@ mkdir -p /var/log/$app
 ynh_config_add_logrotate
 
 #=================================================
-# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...)
-#=================================================
 # UPDATE A CONFIG FILE
 #=================================================
 ynh_script_progression "Updating a config file..."
diff --git a/tests.toml b/tests.toml
index b34a3e6..588a0db 100644
--- a/tests.toml
+++ b/tests.toml
@@ -21,5 +21,5 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
    
-    test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1"
+    #test_upgrade_from.8102fffa52a4e3279bba9fbdafb3a0e5b1fe3e17.name = "4.2.13~ynh1"
     test_upgrade_from.38e8436dd8489140af8921c81d9d891bfa92349e.name = "4.3.9 - Helpers v1"