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