YunoHost-Apps/prosody_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/prosody_ynh.git synced 2024-09-03 20:15:57 +02:00
Code Issues Activity Actions

Merge pull request #6 from YunoHost-Apps/testing

Browse source 
Upgrade to 0.11.13~ynh1
This commit is contained in:
yalh76 2022-06-16 20:42:35 +02:00 • committed by GitHub
commit 177f0b508c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 53 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -1,2 +0,0 @@
*~
*.sw[op]

22
README.md
View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# Prosody for YunoHost # 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) [![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)* *[Lire ce readme en français.](./README_fr.md)*
@ -18,31 +18,29 @@ 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. 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
## Disclaimers / important information ## 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 * 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 ## Documentation and resources
* Official app website: https://prosody.im/ * Official app website: <https://prosody.im/>
* Official admin documentation: https://prosody.im/doc * Official admin documentation: <https://prosody.im/doc>
* Upstream app code repository: https://hg.prosody.im/ * Upstream app code repository: <https://hg.prosody.im/>
* YunoHost documentation for this app: https://yunohost.org/app_prosody * YunoHost documentation for this app: <https://yunohost.org/app_prosody>
* Report a bug: https://github.com/YunoHost-Apps/prosody_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/prosody_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/prosody_ynh/tree/testing). 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. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug
or or
sudo yunohost app upgrade prosody -u https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug 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 **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

28
README_fr.md
View file

@ -1,10 +1,14 @@
<!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
# Prosody pour YunoHost # 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) [![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)* *[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. > *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.* Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
@ -14,31 +18,29 @@ 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. 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
## Avertissements / informations importantes ## 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 * 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 ## Documentations et ressources
* Site officiel de l'app : https://prosody.im/ * Site officiel de l'app : <https://prosody.im/>
* Documentation officielle de l'admin : https://prosody.im/doc * Documentation officielle de l'admin : <https://prosody.im/doc>
* Dépôt de code officiel de l'app : https://hg.prosody.im/ * Dépôt de code officiel de l'app : <https://hg.prosody.im/>
* Documentation YunoHost pour cette app : https://yunohost.org/app_prosody * Documentation YunoHost pour cette app : <https://yunohost.org/app_prosody>
* Signaler un bug : https://github.com/YunoHost-Apps/prosody_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/prosody_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/prosody_ynh/tree/testing). 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. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade prosody -u https://github.com/YunoHost-Apps/prosody_ynh/tree/testing --debug 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 **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

6
check_process
View file

@ -9,7 +9,8 @@
setup_private=0 setup_private=0
setup_public=0 setup_public=0
upgrade=1 upgrade=1
# upgrade=1 from_commit=CommitHash # 0.11.11~ynh1
upgrade=1 from_commit=ef55382f85a80e9a56d362bf34f16db0038dfbab
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=1 port_already_use=1
@ -17,6 +18,3 @@
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none
;;; Upgrade options
; commit=CommitHash
name=Name and date of the commit.

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://prosody.im/downloads/source/prosody-0.11.11.tar.gz SOURCE_URL=https://prosody.im/downloads/source/prosody-0.11.13.tar.gz
SOURCE_SUM=a1af90e2d4ac2f7cf81b385475140ecee60bec1eb83003efb5aeb89765b13774 SOURCE_SUM=39c61b346a09b5125b604cb969e14206cbbcb86c81156ffc6ba2d62527cf0432
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
manifest.json
View file

@ -5,7 +5,7 @@
"description": { "description": {
"en": "a modern XMPP communication server" "en": "a modern XMPP communication server"
}, },
"version": "0.11.11~ynh1", "version": "0.11.13~ynh1",
"url": "https://prosody.im/", "url": "https://prosody.im/",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",

7
scripts/install
View file

@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
ynh_clean_setup () { ynh_clean_setup () {
true ynh_clean_check_starting
} }
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
@ -33,6 +33,11 @@ ynh_script_progression --message="Disabling Metronome..."
ynh_systemd_action --service_name="metronome" --action="stop" ynh_systemd_action --service_name="metronome" --action="stop"
systemctl disable metronome.service --quiet systemctl disable metronome.service --quiet
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 ignore --filter services service=metronome
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
#================================================= #=================================================

5
scripts/remove
View file

@ -104,6 +104,11 @@ ynh_script_progression --message="Enabling Metronome..."
systemctl enable metronome.service --quiet systemctl enable metronome.service --quiet
ynh_systemd_action --service_name="metronome" --action="start" 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 unignore --filter services service=metronome
ynh_exec_warn_less yunohost diagnosis run --force
#================================================= #=================================================
# END OF SCRIPT # END OF SCRIPT
#================================================= #=================================================

7
scripts/restore
View file

@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
ynh_clean_setup () { ynh_clean_setup () {
true ynh_clean_check_starting
} }
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
@ -38,6 +38,11 @@ ynh_script_progression --message="Disabling Metronome..."
ynh_systemd_action --service_name="metronome" --action="stop" ynh_systemd_action --service_name="metronome" --action="stop"
systemctl disable metronome.service --quiet systemctl disable metronome.service --quiet
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 ignore --filter services service=metronome
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
#================================================= #=================================================

6
scripts/upgrade
View file

@ -34,6 +34,7 @@ ynh_script_progression --message="Backing up the app before upgrading (may take
# Backup the current version of the app # Backup the current version of the app
ynh_backup_before_upgrade ynh_backup_before_upgrade
ynh_clean_setup () { ynh_clean_setup () {
ynh_clean_check_starting
# Restore it if the upgrade fails # Restore it if the upgrade fails
ynh_restore_upgradebackup ynh_restore_upgradebackup
} }
@ -48,6 +49,11 @@ ynh_script_progression --message="Disabling Metronome..."
ynh_systemd_action --service_name="metronome" --action="stop" ynh_systemd_action --service_name="metronome" --action="stop"
systemctl disable metronome.service --quiet systemctl disable metronome.service --quiet
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 ignore --filter services service=metronome
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================