From 89b50ffed853ffe5b82ef481ee270ca19762fe4d Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 30 Aug 2024 22:45:37 +0200 Subject: [PATCH 1/2] [autopatch] Automatic patch attempt for helpers 2.1 --- manifest.toml | 4 +++- scripts/backup | 17 ++++------------- scripts/change_url | 14 ++++---------- scripts/install | 21 +++++++-------------- scripts/remove | 12 +++--------- scripts/restore | 25 ++++++++----------------- scripts/upgrade | 26 ++++++++++---------------- 7 files changed, 39 insertions(+), 80 deletions(-) diff --git a/manifest.toml b/manifest.toml index 52a77eb..04486c3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,8 @@ admindoc = "https://conversejs.org/docs/html/index.html" code = "https://github.com/conversejs/converse.js" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.18" +helpers_version = "2.1" architectures = "all" multi_instance = true @@ -56,6 +57,7 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] + group = "www-data:r-x" [resources.permissions] main.url = "/" diff --git a/scripts/backup b/scripts/backup index a6b113b..24cbaff 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,32 +1,23 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 1d5043c..f3ce837 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,25 +1,19 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers # Stop script if errors -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=3 +ynh_script_progression "Updating NGINX web server configuration..." -ynh_change_url_nginx_config +ynh_config_change_url_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index a292d77..3af9d66 100755 --- a/scripts/install +++ b/scripts/install @@ -1,11 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers #================================================= @@ -15,31 +9,30 @@ source /usr/share/yunohost/helpers maindomain=$(yunohost domain main-domain --output-as plain) -ynh_app_setting_set --app=$app --key=maindomain --value=$maindomain +ynh_app_setting_set --key=maindomain --value=$maindomain #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=1 +ynh_script_progression "Setting up source files..." # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" -ynh_add_config --template="../sources/index.html" --destination="$install_dir/index.html" +ynh_config_add --template="../sources/index.html" --destination="$install_dir/index.html" cp "../sources/libsignal-protocol.min.js" "$install_dir/dist/libsignal-protocol.min.js" -chown -R "$app:www-data" "$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:www-data" "$install_dir" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 +ynh_script_progression "Configuring NGINX web server..." # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 2952ff1..468c041 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,23 +1,17 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression "Removing NGINX web server configuration..." # Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index b361306..ccd6726 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,40 +1,31 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=2 - -ynh_restore_file --origin_path="$install_dir" +ynh_script_progression "Restoring the app main directory..." -chown -R $app:www-data "$install_dir" +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 | chown -R $app:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +ynh_script_progression "Restoring system configurations related to $app..." -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=3 +ynh_script_progression "Reloading NGINX web server..." -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index b5a215d..ba562c2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,47 +1,41 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source /usr/share/yunohost/helpers #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 +ynh_script_progression "Ensuring downward compatibility..." # If maindomain doesn't exist, create it +# FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=maindomain --value=$(yunohost domain main-domain --output-as plain) if [ -z "${maindomain:-}" ]; then maindomain=$(yunohost domain main-domain --output-as plain) - ynh_app_setting_set --app=$app --key=maindomain --value=$maindomain + ynh_app_setting_set --key=maindomain --value=$maindomain fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." --weight=4 +ynh_script_progression "Upgrading source files..." # Download, check integrity, uncompress and patch the source from manifest.toml -ynh_setup_source --dest_dir="$install_dir" --full_replace=1 +ynh_setup_source --dest_dir="$install_dir" --full_replace -ynh_add_config --template="../sources/index.html" --destination="$install_dir/index.html" +ynh_config_add --template="../sources/index.html" --destination="$install_dir/index.html" cp "../sources/libsignal-protocol.min.js" "$install_dir/dist/libsignal-protocol.min.js" -chown -R $app:www-data "$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:www-data "$install_dir" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 +ynh_script_progression "Upgrading NGINX web server configuration..." # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed" From f2eac1197a11cdbccce53d5515cfdbad302e58fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Dec 2024 22:49:37 +0100 Subject: [PATCH 2/2] cleaning --- doc/DESCRIPTION_fr.md | 12 ++++++++++++ manifest.toml | 3 +-- scripts/change_url | 3 --- scripts/install | 4 ---- scripts/remove | 1 - scripts/restore | 1 - scripts/upgrade | 9 +-------- 7 files changed, 14 insertions(+), 19 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..07e5427 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,12 @@ +Converse est un client de chat XMPP gratuit et open source écrit en JavaScript qui peut être étroitement intégré à n'importe quel site Web. +L'avantage d'utiliser converse.js plutôt que de s'appuyer sur une solution SaaS (logiciel en tant que service) est que vos utilisateurs peuvent bénéficier d'une expérience de chat Web beaucoup plus personnalisée, rationalisée et intégrée et que vous avez le contrôle sur les données. Ce dernier point étant une exigence pour de nombreux sites traitant des informations sensibles. + +### Fonctionnalités + +- Partage de fichiers (ne fonctionne pas encore) +- Cryptage des messages de bout en bout (XEP-0384 OMEMO) +- Ouvrir des chats via une URL +- Notifications +- Support multilingue +- Modération des salles de discussion +- Connexion sans mot de passe avec certificats clients \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 04486c3..6b5e5fc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,13 +17,12 @@ admindoc = "https://conversejs.org/docs/html/index.html" code = "https://github.com/conversejs/converse.js" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.30" helpers_version = "2.1" architectures = "all" multi_instance = true ldap = false - sso = false disk = "50M" diff --git a/scripts/change_url b/scripts/change_url index f3ce837..2678882 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -2,9 +2,6 @@ source /usr/share/yunohost/helpers -# Stop script if errors -#REMOVEME? ynh_abort_if_errors - #================================================= # MODIFY URL IN NGINX CONF #================================================= diff --git a/scripts/install b/scripts/install index 3af9d66..1b084a8 100755 --- a/scripts/install +++ b/scripts/install @@ -5,7 +5,6 @@ source /usr/share/yunohost/helpers #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -# Retrieve arguments maindomain=$(yunohost domain main-domain --output-as plain) @@ -16,19 +15,16 @@ ynh_app_setting_set --key=maindomain --value=$maindomain #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" ynh_config_add --template="../sources/index.html" --destination="$install_dir/index.html" cp "../sources/libsignal-protocol.min.js" "$install_dir/dist/libsignal-protocol.min.js" -#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:www-data" "$install_dir" #================================================= # NGINX CONFIGURATION #================================================= ynh_script_progression "Configuring NGINX web server..." -# Create a dedicated NGINX config ynh_config_add_nginx #================================================= diff --git a/scripts/remove b/scripts/remove index 468c041..b3575da 100755 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Removing NGINX web server configuration..." -# Remove the dedicated NGINX config ynh_config_remove_nginx #================================================= diff --git a/scripts/restore b/scripts/restore index ccd6726..6f69aad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,7 +9,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 | chown -R $app:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ba562c2..b7e6edf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -8,30 +8,23 @@ source /usr/share/yunohost/helpers ynh_script_progression "Ensuring downward compatibility..." # If maindomain doesn't exist, create it -# FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=maindomain --value=$(yunohost domain main-domain --output-as plain) -if [ -z "${maindomain:-}" ]; then - maindomain=$(yunohost domain main-domain --output-as plain) - ynh_app_setting_set --key=maindomain --value=$maindomain -fi +ynh_app_setting_set_default --key=maindomain --value=$(yunohost domain main-domain --output-as plain) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" --full_replace ynh_config_add --template="../sources/index.html" --destination="$install_dir/index.html" cp "../sources/libsignal-protocol.min.js" "$install_dir/dist/libsignal-protocol.min.js" -#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:www-data "$install_dir" #================================================= # NGINX CONFIGURATION #================================================= ynh_script_progression "Upgrading NGINX web server configuration..." -# Create a dedicated NGINX config ynh_config_add_nginx #=================================================