Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[autopatch] Automatic patch attempt for helpers 2.1 #35

Open
wants to merge 2 commits into
base: testing
Choose a base branch
from
Open

[autopatch] Automatic patch attempt for helpers 2.1 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b50ff
[autopatch] Automatic patch attempt for helpers 2.1
Aug 30, 2024
f2eac11
cleaning
ericgaspar Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions doc/DESCRIPTION_fr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ admindoc = "https://conversejs.org/docs/html/index.html"
code = "https://github.com/conversejs/converse.js"

[integration]
yunohost = ">= 11.2"
yunohost = ">= 11.2.30"
helpers_version = "2.1"
architectures = "all"
multi_instance = true

ldap = false

sso = false

disk = "50M"
Expand Down Expand Up @@ -56,6 +56,7 @@ ram.runtime = "50M"
[resources.system_user]

[resources.install_dir]
group = "www-data:r-x"

[resources.permissions]
main.url = "/"
17 changes: 4 additions & 13 deletions scripts/backup
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)."
15 changes: 3 additions & 12 deletions scripts/change_url
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
#!/bin/bash

#=================================================
# GENERIC STARTING
#=================================================
# IMPORT GENERIC HELPERS
#=================================================

source /usr/share/yunohost/helpers

# Stop script if errors
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"
23 changes: 6 additions & 17 deletions scripts/install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,34 @@
#!/bin/bash

#=================================================
# GENERIC START
#=================================================
# IMPORT GENERIC HELPERS
#=================================================

source /usr/share/yunohost/helpers

#=================================================
# RETRIEVE ARGUMENTS FROM THE MANIFEST
#=================================================
# Retrieve arguments

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"

#=================================================
# 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"
13 changes: 3 additions & 10 deletions scripts/remove
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
#!/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"
24 changes: 7 additions & 17 deletions scripts/restore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,30 @@
#!/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"

#=================================================
# 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"
29 changes: 8 additions & 21 deletions scripts/upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,34 @@
#!/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
if [ -z "${maindomain:-}" ]; then
maindomain=$(yunohost domain main-domain --output-as plain)
ynh_app_setting_set --app=$app --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 --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"

#=================================================
# 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"