diff --git a/README.md b/README.md index a035984..71254c7 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) ## Limitations diff --git a/README_fr.md b/README_fr.md index a8a7ab9..78963e8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -42,8 +42,8 @@ Comment configurer cette application : via le panneau d'administration, un fichi #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/laverna.svg)](https://ci-apps.yunohost.org/ci/apps/laverna/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/laverna.svg)](https://ci-apps-arm.yunohost.org/ci/apps/laverna/) ## Limitations diff --git a/check_process b/check_process index faa58c5..344fafa 100644 --- a/check_process +++ b/check_process @@ -18,7 +18,6 @@ upgrade=1 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=0 ;;; Options Email= diff --git a/manifest.json b/manifest.json index 9c76bd4..7d3e5dc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Taking note application with Markdown editor and encryption support.", "fr": "Application de Prise de note avec éditeur Markdown et chiffrement." }, - "version": "0.7.51~ynh4", + "version": "0.7.51~ynh5", "url": "https://laverna.cc/index.html", "license": "MPL-2.0", "maintainer": { @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">> 3.8.1" + "yunohost": ">> 4.1.7" }, "multi_instance": true, "services": [ @@ -24,30 +24,18 @@ "install" : [ { "name": "domain", - "type": "domain", - "ask": { - "en": "Choose a domain name for Laverna", - "fr": "Choisissez un nom de domaine pour Laverna" - }, + "type": "domain", "example": "example.com" }, { - "name": "path", - "type": "path", - "ask": { - "en": "Choose a path for Laverna", - "fr": "Choisissez un chemin pour Laverna" - }, + "name": "path", + "type": "path", "example": "/laverna", "default": "/laverna" }, { - "name": "is_public", - "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, + "name": "is_public", + "type": "boolean", "help": { "en": "If enabled, Laverna will be accessible by people who do not have an account. This can be changed later via the webadmin.", "fr": "Si cette case est cochée, Laverna sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." diff --git a/pull_request_template.md b/pull_request_template.md index 793696c..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -13,6 +13,4 @@ ## Package_check results --- -*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* - -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/laverna_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/laverna_ynh%20PR-NUM-%20(USERNAME)/) +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index aa15ac6..f5c7588 100755 --- a/scripts/install +++ b/scripts/install @@ -42,7 +42,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -76,8 +75,6 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=1 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. ynh_permission_update --permission "main" --add "visitors" fi diff --git a/scripts/upgrade b/scripts/upgrade index 3ee7b41..d7ebcfa 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -17,7 +17,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= @@ -31,21 +30,19 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If final_path doesn't exist, create it if [ -z "$final_path" ]; then final_path=/var/www/$app ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #=================================================