diff --git a/README.md b/README.md index d428f10..8cc8ae9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Matterbridge for YunoHost -[![Integration level](https://dash.yunohost.org/integration/matterbridge.svg)](https://dash.yunohost.org/appci/app/matterbridge) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/matterbridge.svg)](https://dash.yunohost.org/appci/app/matterbridge) ![Working status](https://ci-apps.yunohost.org/ci/badges/matterbridge.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/matterbridge.maintain.svg) [![Install Matterbridge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matterbridge) *[Lire ce readme en français.](./README_fr.md)* @@ -17,10 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Multi-protocols bridge for online communications -**Shipped version:** 1.25.1~ynh1 - - - +**Shipped version:** 1.25.2~ynh1 ## Disclaimers / important information ## Configuration @@ -29,21 +26,22 @@ How to configure this app: a plain file with SSH `/opt/yunohost/matterbridge/mat ## Documentation and resources -* Official app website: https://github.com/42wim/matterbridge -* Official admin documentation: https://github.com/42wim/matterbridge/wiki -* Upstream app code repository: https://github.com/42wim/matterbridge -* YunoHost documentation for this app: https://yunohost.org/app_matterbridge -* Report a bug: https://github.com/YunoHost-Apps/matterbridge_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing --debug or sudo yunohost app upgrade matterbridge -u https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index d84e6e0..c13e8da 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Matterbridge pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/matterbridge.svg)](https://dash.yunohost.org/appci/app/matterbridge) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/matterbridge.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/matterbridge.svg)](https://dash.yunohost.org/appci/app/matterbridge) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/matterbridge.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/matterbridge.maintain.svg) [![Installer Matterbridge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=matterbridge) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Matterbridge rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -13,10 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Connecteur entre une série de protocoles de discussion -**Version incluse :** 1.25.1~ynh1 - - - +**Version incluse :** 1.25.2~ynh1 ## Avertissements / informations importantes ## Configuration @@ -25,21 +26,22 @@ Comment configurer cette application : un fichier brut en SSH `/opt/yunohost/mat ## Documentations et ressources -* Site officiel de l'app : https://github.com/42wim/matterbridge -* Documentation officielle de l'admin : https://github.com/42wim/matterbridge/wiki -* Dépôt de code officiel de l'app : https://github.com/42wim/matterbridge -* Documentation YunoHost pour cette app : https://yunohost.org/app_matterbridge -* Signaler un bug : https://github.com/YunoHost-Apps/matterbridge_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing --debug ou sudo yunohost app upgrade matterbridge -u https://github.com/YunoHost-Apps/matterbridge_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/conf/amd64.src b/conf/amd64.src index 15f6608..1138f8d 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.1/matterbridge-1.25.1-linux-64bit -SOURCE_SUM=03c6f74525cb1bebdbd569acb72e38a1374c01ee049e3b2bf357df7893305b00 +SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.2/matterbridge-1.25.2-linux-64bit +SOURCE_SUM=146f3b5d7b045967d61be82d7135de300515daf33961f591aaf6e9d6ee4aeddf SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=matterbridge diff --git a/conf/arm64.src b/conf/arm64.src index bf80978..941a780 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.1/matterbridge-1.25.1-linux-arm64 -SOURCE_SUM=5618e0fab2e3de5e4ba5f6d424b47d036e2c00486d201b635b8f6a6682637f8d +SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.2/matterbridge-1.25.2-linux-arm64 +SOURCE_SUM=ec288472ee2b1f542586c99d2b4c37c36a77593ed1cf36470f236b1f2a6cb63c SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=matterbridge diff --git a/conf/armhf.src b/conf/armhf.src index 8d764e1..561434c 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.1/matterbridge-1.25.1-linux-armv7 -SOURCE_SUM=7da33e71d5c3f4daac98db6a06ca56312a03f5b2441661acdd06fdcf66f21d1a +SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.25.2/matterbridge-1.25.2-linux-armv6 +SOURCE_SUM=50ad94be6d98bc0a908f28de4493df5ffbe497af1a5279cdec00f0221e00a275 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=matterbridge diff --git a/manifest.json b/manifest.json index 5119e1d..6658844 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Multi-protocols bridge for online communications", "fr": "Connecteur entre une série de protocoles de discussion" }, - "version": "1.25.1~ynh1", + "version": "1.25.2~ynh1", "url": "https://github.com/42wim/matterbridge", "upstream": { "license": "Apache-2.0", diff --git a/scripts/install b/scripts/install index cf8b782..148293c 100644 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -chmod +x $final_path/$app +chmod +x $final_path/matterbridge #================================================= # MODIFY A CONFIG FILE diff --git a/scripts/upgrade b/scripts/upgrade index 69e1494..1a55f0c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,15 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# STANDARD UPGRADE STEPS +#================================================= +# STOP SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Stopping a systemd service..." --weight=1 + +ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -38,15 +47,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 - -ynh_systemd_action --service_name=$app --action=stop --log_path="/var/log/$app/$app.log" - #================================================= # CREATE DEDICATED USER #================================================= @@ -63,29 +63,14 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=2 - # Create a temporary directory - #tmpdir="$(mktemp -d)" - - # Backup the config file in the temp dir - #cp -a "$final_path/matterbridge.toml" "$tmpdir/matterbridge.toml" - - # Remove the app directory securely - #ynh_secure_remove --file="$final_path" - # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH --keep="$final_path/matterbridge.toml" - - # Copy the admin saved settings from tmp directory to final path - #cp -a "$tmpdir/matterbridge.toml" "$final_path/matterbridge.toml" - - # Remove the tmp directory securely - #ynh_secure_remove --file="$tmpdir" fi chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -chmod +x $final_path/$app +chmod +x $final_path/matterbridge #================================================= # SETUP SYSTEMD