From 44dfabe40430fda97b27ebd2d6af50d04210b90b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 9 Jun 2022 02:10:15 +0200 Subject: [PATCH 1/5] Upgrade to 0.11.13.~ynh1 --- .gitignore | 2 -- README.md | 2 +- README_fr.md | 2 +- check_process | 6 ++---- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/install | 8 +++++++- scripts/remove | 6 ++++++ scripts/restore | 8 +++++++- scripts/upgrade | 7 +++++++ 10 files changed, 34 insertions(+), 13 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] diff --git a/README.md b/README.md index 901971c..62e0a18 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Prosody is a modern XMPP communication server. It aims to be easy to set up and configure, and efficient with system resources. Additionally, for developers it aims to be easy to extend and give a flexible system on which to rapidly develop added functionality, or prototype new protocols. -**Shipped version:** 0.11.11~ynh1 +**Shipped version:** 0.11.13.~ynh1 diff --git a/README_fr.md b/README_fr.md index 2560f99..b1d9465 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Prosody is a modern XMPP communication server. It aims to be easy to set up and configure, and efficient with system resources. Additionally, for developers it aims to be easy to extend and give a flexible system on which to rapidly develop added functionality, or prototype new protocols. -**Version incluse :** 0.11.11~ynh1 +**Version incluse :** 0.11.13.~ynh1 diff --git a/check_process b/check_process index 45f593d..0be8f19 100644 --- a/check_process +++ b/check_process @@ -9,7 +9,8 @@ setup_private=0 setup_public=0 upgrade=1 - # upgrade=1 from_commit=CommitHash + # 0.11.11~ynh1 + upgrade=1 from_commit=ef55382f85a80e9a56d362bf34f16db0038dfbab backup_restore=1 multi_instance=0 port_already_use=1 @@ -17,6 +18,3 @@ ;;; Options Email= Notification=none -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. diff --git a/conf/app.src b/conf/app.src index 2835bf8..df1c9fe 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://prosody.im/downloads/source/prosody-0.11.11.tar.gz -SOURCE_SUM=a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 +SOURCE_URL=https://prosody.im/downloads/source/prosody-0.11.13.tar.gz +SOURCE_SUM=39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 9d0dbde..de56c80 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "a modern XMPP communication server" }, - "version": "0.11.11~ynh1", + "version": "0.11.13.~ynh1", "url": "https://prosody.im/", "upstream": { "license": "MIT", diff --git a/scripts/install b/scripts/install index 7b03487..d1922b7 100755 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - true + ynh_clean_check_starting } # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -33,6 +33,12 @@ ynh_script_progression --message="Disabling Metronome..." ynh_systemd_action --service_name="metronome" --action="stop" systemctl disable metronome.service --quiet +ynh_exec_warn_less yunohost diagnosis run ports --force +ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5222 +ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5269 +ynh_exec_warn_less yunohost diagnosis run services --force +ynh_exec_warn_less yunohost diagnosis ignore --filter services service=metronome + #================================================= # STORE SETTINGS FROM MANIFEST #================================================= diff --git a/scripts/remove b/scripts/remove index 7e6f0f8..22d472e 100755 --- a/scripts/remove +++ b/scripts/remove @@ -104,6 +104,12 @@ ynh_script_progression --message="Enabling Metronome..." systemctl enable metronome.service --quiet ynh_systemd_action --service_name="metronome" --action="start" +ynh_exec_warn_less yunohost diagnosis unignore --filter ports port=5222 +ynh_exec_warn_less yunohost diagnosis unignore --filter ports port=5269 +ynh_exec_warn_less yunohost diagnosis run ports --force +ynh_exec_warn_less yunohost diagnosis unignore --filter services service=metronome +ynh_exec_warn_less yunohost diagnosis run services --force + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index c03c2dd..c737b8f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_clean_setup () { - true + ynh_clean_check_starting } # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -38,6 +38,12 @@ ynh_script_progression --message="Disabling Metronome..." ynh_systemd_action --service_name="metronome" --action="stop" systemctl disable metronome.service --quiet +ynh_exec_warn_less yunohost diagnosis run ports --force +ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5222 +ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5269 +ynh_exec_warn_less yunohost diagnosis run services --force +ynh_exec_warn_less yunohost diagnosis ignore --filter services service=metronome + #================================================= # STANDARD RESTORATION STEPS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7a20898..ea9deb3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,6 +34,7 @@ ynh_script_progression --message="Backing up the app before upgrading (may take # Backup the current version of the app ynh_backup_before_upgrade ynh_clean_setup () { + ynh_clean_check_starting # Restore it if the upgrade fails ynh_restore_upgradebackup } @@ -48,6 +49,12 @@ ynh_script_progression --message="Disabling Metronome..." ynh_systemd_action --service_name="metronome" --action="stop" systemctl disable metronome.service --quiet +ynh_exec_warn_less yunohost diagnosis run ports --force +ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5222 +ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5269 +ynh_exec_warn_less yunohost diagnosis run services --force +ynh_exec_warn_less yunohost diagnosis ignore --filter services service=metronome + #================================================= # STANDARD UPGRADE STEPS #================================================= From b5610e190cdfae0f48471c2fa610402be375fa9e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 9 Jun 2022 00:10:20 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 20 +++++++++----------- README_fr.md | 26 ++++++++++++++------------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 62e0a18..7f9b291 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Prosody for YunoHost -[![Integration level](https://dash.yunohost.org/integration/prosody.svg)](https://dash.yunohost.org/appci/app/prosody) ![](https://ci-apps.yunohost.org/ci/badges/prosody.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/prosody.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/prosody.svg)](https://dash.yunohost.org/appci/app/prosody) ![Working status](https://ci-apps.yunohost.org/ci/badges/prosody.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/prosody.maintain.svg) [![Install Prosody with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=prosody) *[Lire ce readme en français.](./README_fr.md)* @@ -19,30 +19,28 @@ Prosody is a modern XMPP communication server. It aims to be easy to set up and **Shipped version:** 0.11.13.~ynh1 - - - ## Disclaimers / important information * Prosody will not replace the XMPP service Metronome integrated in YunoHost, it has been implemented for some specific apps that require Prosody ## Documentation and resources -* Official app website: https://prosody.im/ -* Official admin documentation: https://prosody.im/doc -* Upstream app code repository: https://hg.prosody.im/ -* YunoHost documentation for this app: https://yunohost.org/app_prosody -* Report a bug: https://github.com/YunoHost-Apps/prosody_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/prosody_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug or sudo yunohost app upgrade prosody -u https://github.com/YunoHost-Apps/prosody_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 b1d9465..32e9e0e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Prosody pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/prosody.svg)](https://dash.yunohost.org/appci/app/prosody) ![](https://ci-apps.yunohost.org/ci/badges/prosody.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/prosody.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/prosody.svg)](https://dash.yunohost.org/appci/app/prosody) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/prosody.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/prosody.maintain.svg) [![Installer Prosody avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=prosody) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Prosody 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.* @@ -15,30 +19,28 @@ Prosody is a modern XMPP communication server. It aims to be easy to set up and **Version incluse :** 0.11.13.~ynh1 - - - ## Avertissements / informations importantes * Prosody will not replace the XMPP service Metronome integrated in YunoHost, it has been implemented for some specific apps that require Prosody ## Documentations et ressources -* Site officiel de l'app : https://prosody.im/ -* Documentation officielle de l'admin : https://prosody.im/doc -* Dépôt de code officiel de l'app : https://hg.prosody.im/ -* Documentation YunoHost pour cette app : https://yunohost.org/app_prosody -* Signaler un bug : https://github.com/YunoHost-Apps/prosody_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/prosody_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug ou sudo yunohost app upgrade prosody -u https://github.com/YunoHost-Apps/prosody_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 :** From 34de2c17af7ca803fd8e31915bb83296154f4568 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 12 Jun 2022 13:37:24 +0200 Subject: [PATCH 3/5] Fix yunohost diagnosis run --- scripts/install | 3 +-- scripts/remove | 3 +-- scripts/restore | 3 +-- scripts/upgrade | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index d1922b7..4de0362 100755 --- a/scripts/install +++ b/scripts/install @@ -33,10 +33,9 @@ ynh_script_progression --message="Disabling Metronome..." ynh_systemd_action --service_name="metronome" --action="stop" systemctl disable metronome.service --quiet -ynh_exec_warn_less yunohost diagnosis run ports --force +ynh_exec_warn_less yunohost diagnosis run --force ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5222 ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5269 -ynh_exec_warn_less yunohost diagnosis run services --force ynh_exec_warn_less yunohost diagnosis ignore --filter services service=metronome #================================================= diff --git a/scripts/remove b/scripts/remove index 22d472e..6677116 100755 --- a/scripts/remove +++ b/scripts/remove @@ -106,9 +106,8 @@ ynh_systemd_action --service_name="metronome" --action="start" ynh_exec_warn_less yunohost diagnosis unignore --filter ports port=5222 ynh_exec_warn_less yunohost diagnosis unignore --filter ports port=5269 -ynh_exec_warn_less yunohost diagnosis run ports --force ynh_exec_warn_less yunohost diagnosis unignore --filter services service=metronome -ynh_exec_warn_less yunohost diagnosis run services --force +ynh_exec_warn_less yunohost diagnosis run --force #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index c737b8f..859b8a4 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,10 +38,9 @@ ynh_script_progression --message="Disabling Metronome..." ynh_systemd_action --service_name="metronome" --action="stop" systemctl disable metronome.service --quiet -ynh_exec_warn_less yunohost diagnosis run ports --force +ynh_exec_warn_less yunohost diagnosis run --force ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5222 ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5269 -ynh_exec_warn_less yunohost diagnosis run services --force ynh_exec_warn_less yunohost diagnosis ignore --filter services service=metronome #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ea9deb3..6153014 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,10 +49,9 @@ ynh_script_progression --message="Disabling Metronome..." ynh_systemd_action --service_name="metronome" --action="stop" systemctl disable metronome.service --quiet -ynh_exec_warn_less yunohost diagnosis run ports --force +ynh_exec_warn_less yunohost diagnosis run --force ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5222 ynh_exec_warn_less yunohost diagnosis ignore --filter ports port=5269 -ynh_exec_warn_less yunohost diagnosis run services --force ynh_exec_warn_less yunohost diagnosis ignore --filter services service=metronome #================================================= From 70d55180ad9be2b0441e7b41cd99c5ac215b5b94 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 15 Jun 2022 01:07:30 +0200 Subject: [PATCH 4/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index de56c80..fa4db84 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "a modern XMPP communication server" }, - "version": "0.11.13.~ynh1", + "version": "0.11.13~ynh1", "url": "https://prosody.im/", "upstream": { "license": "MIT", From 5efcaf52424dd4704c1579eb6acb9da029d2e068 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 14 Jun 2022 23:07:35 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f9b291..4a32649 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Prosody is a modern XMPP communication server. It aims to be easy to set up and configure, and efficient with system resources. Additionally, for developers it aims to be easy to extend and give a flexible system on which to rapidly develop added functionality, or prototype new protocols. -**Shipped version:** 0.11.13.~ynh1 +**Shipped version:** 0.11.13~ynh1 ## Disclaimers / important information * Prosody will not replace the XMPP service Metronome integrated in YunoHost, it has been implemented for some specific apps that require Prosody diff --git a/README_fr.md b/README_fr.md index 32e9e0e..33106c7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Prosody is a modern XMPP communication server. It aims to be easy to set up and configure, and efficient with system resources. Additionally, for developers it aims to be easy to extend and give a flexible system on which to rapidly develop added functionality, or prototype new protocols. -**Version incluse :** 0.11.13.~ynh1 +**Version incluse :** 0.11.13~ynh1 ## Avertissements / informations importantes * Prosody will not replace the XMPP service Metronome integrated in YunoHost, it has been implemented for some specific apps that require Prosody