From d3d51d4dcc70f74e9398a0be9efd4b1a9dbd40e1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 16 Mar 2021 18:20:59 +0100 Subject: [PATCH] Upgrade to 3.3.1 --- README.md | 7 +++---- README_fr.md | 27 +++++++++++++-------------- check_process | 2 -- conf/app.src | 6 +++--- manifest.json | 16 ++-------------- scripts/install | 3 +-- scripts/upgrade | 8 +++++++- 7 files changed, 29 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index b69393e..398f3ba 100755 --- a/README.md +++ b/README.md @@ -1,17 +1,16 @@ # Mautic for YunoHost [![Integration level](https://dash.yunohost.org/integration/mautic.svg)](https://dash.yunohost.org/appci/app/mautic) ![](https://ci-apps.yunohost.org/ci/badges/mautic.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mautic.maintain.svg) -[![Install mautic with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautic) +[![Install Mautic with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautic) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install mautic quickly and simply on a YunoHost server. +> *This package allows you to install Mautic quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview - -**Shipped version:** 3.2.2 +**Shipped version:** 3.3.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 82d2cee..f38038c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,17 +1,16 @@ -# Castopod pour YunoHost +# Mautic pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/castopod.svg)](https://dash.yunohost.org/appci/app/castopod) ![](https://ci-apps.yunohost.org/ci/badges/castopod.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/castopod.maintain.svg) -[![Installer Castopod avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=castopod) +[![Niveau d'intégration](https://dash.yunohost.org/integration/mautic.svg)](https://dash.yunohost.org/appci/app/mautic) ![](https://ci-apps.yunohost.org/ci/badges/mautic.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mautic.maintain.svg) +[![Installer mautic avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautic) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Castopod rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Mautic rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble -Castopod Server est une plate-forme d'hébergement open source conçue pour les podcasteurs qui souhaitent s'engager et interagir avec leur public. Veuillez noter que Castopod est toujours en développement: il n'est peut-être pas stable à 100% et certaines fonctionnalités sont encore en développement. -**Version incluse :** 3.2.2 +**Version incluse :** 3.3.1 ## Captures d'écran @@ -40,8 +39,8 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/castopod%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/castopod/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/castopod%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/castopod/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mautic%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mautic/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mautic%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mautic/) ## Limitations @@ -53,20 +52,20 @@ Castopod Server est une plate-forme d'hébergement open source conçue pour les ## Liens - * Signaler un bug : https://github.com/YunoHost-Apps/castopod_ynh/issues - * Site de l'application : https://podlibre.org/ - * Dépôt de l'application principale : https://code.podlibre.org/podlibre/castopod + * Signaler un bug : https://github.com/YunoHost-Apps/mautic_ynh/issues + * Site de l'application : https://www.mautic.org/ + * Dépôt de l'application principale : https://github.com/mautic/mautic * Site web YunoHost : https://yunohost.org/ --- ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/castopod_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mautic_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/castopod_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/mautic_ynh/tree/testing --debug ou -sudo yunohost app upgrade castopod -u https://github.com/YunoHost-Apps/castopod_ynh/tree/testing --debug +sudo yunohost app upgrade mautic -u https://github.com/YunoHost-Apps/mautic_ynh/tree/testing --debug ``` diff --git a/check_process b/check_process index c99157e..e621d9d 100755 --- a/check_process +++ b/check_process @@ -1,8 +1,6 @@ # See here for more information # https://github.com/YunoHost/package_check#syntax-check_process-file -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) diff --git a/conf/app.src b/conf/app.src index 0c95abe..1e60f08 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/mautic/mautic/releases/download/3.2.2/3.2.2.zip -SOURCE_SUM=ccca797b3eb4ac574d0517644f7e265a7faae4868c0678f4843c013b623cf286 +SOURCE_URL=https://github.com/mautic/mautic/releases/download/3.3.1/3.3.1.zip +SOURCE_SUM=10d5be5a70750a93ebfac994f2f5adfab9b54bc46ba4295c5aac4ef6e74d1b2a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=3.2.2.zip +SOURCE_FILENAME=3.3.1.zip diff --git a/manifest.json b/manifest.json index 15caad9..1348d7d 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Marketing Automation Software.", "fr": "Logiciel d'automatisation marketing open source." }, - "version": "3.2.2~ynh1", + "version": "3.3.1~ynh1", "url": "https://www.mautic.org/", "license": "GPL-3.0-only", "maintainer": { @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -27,29 +27,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name forMautic", - "fr": "Choisissez un nom de domaine pour Mautic" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Mautic", - "fr": "Choisissez un chemin pour Mautic" - }, "example": "/mautic", "default": "/mautic" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "help": { "en": "If enabled, Mautic 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, Mautic sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." diff --git a/scripts/install b/scripts/install index e9f1bd2..e05e750 100755 --- a/scripts/install +++ b/scripts/install @@ -44,7 +44,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 #================================================= # CREATE A MYSQL DATABASE @@ -145,7 +144,7 @@ ynh_script_progression --message="Configuring SSOwat..." --weight=10 # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2e47736..2444e21 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,7 +18,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) db_name=$(ynh_app_setting_get --app=$app --key=db_name) @@ -45,6 +44,13 @@ if [ -z "$final_path" ]; then 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 #=================================================