Merge branch 'testing' into ci-auto-update-3.3.0

manifest.toml

@@ -19,7 +19,7 @@ code = "https://github.com/discourse/discourse"
 cpe = "cpe:2.3:a:discourse:discourse"
 
 [integration]
-yunohost = ">=11.2.12"
+yunohost = ">=11.2.20"
 architectures = "all"
 multi_instance = true
 ldap = true

scripts/backup

@@ -20,7 +20,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE SYSTEM CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"

scripts/install

@@ -41,10 +41,12 @@ ynh_app_setting_set --app="$app" --key=unicorn_workers --value=$unicorn_workers
 # INSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Installing Ruby..."
+
 ynh_exec_warn_less ynh_install_ruby --ruby_version="$ruby_version"
 ynh_use_ruby
 
 ynh_script_progression --message="Installing NodeJS..."
+
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================

scripts/remove

@@ -26,20 +26,10 @@ ynh_remove_logrotate
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE THE REDIS DATABASE
-#=================================================
-ynh_script_progression --message="Removing the redis database..."
-
 ynh_redis_remove_db "$redis_db"
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing NodeJS..."
 ynh_remove_nodejs
 
-ynh_script_progression --message="Removing Ruby..."
 ynh_remove_ruby
 
 #=================================================