diff --git a/README.md b/README.md index e343630..26af0a8 100644 --- a/README.md +++ b/README.md @@ -3,17 +3,15 @@ [![Integration level](https://dash.yunohost.org/integration/codimd.svg)](https://dash.yunohost.org/appci/app/codimd) ![](https://ci-apps.yunohost.org/ci/badges/codimd.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/codimd.maintain.svg) [![Install CodiMD with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=codimd) -> :warning: The CodiMD project has been renamed HedgeDoc. The YunoHost package for HedgeDoc is now hosted at this address https://github.com/YunoHost-Apps/hedgedoc_ynh. codimd_ynh will stay at version 1.6.0 and will no longer be updated. - *[Lire ce readme en français.](./README_fr.md)* > *This package allows you to install CodiMD 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.* +If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview CodiMD is a real-time collaborative word processing web service. It uses Markdown language. -**Shipped version:** 1.6.0 +**Shipped version:** 2.3.2 ## Screenshots @@ -29,8 +27,8 @@ You can configure CodiMD by editing this file `/var/www/codimd/config.json` usin ## Documentation - * Official documentation: https://github.com/hedgedoc/hedgedoc/tree/master/docs - * YunoHost documentation: https://yunohost.org/#/app_codimd + * Official documentation: https://hackmd.io/c/codimd-documentation/%2Fs%2Fcodimd-documentation + * YunoHost documentation: https://yunohost.org/en/app_codimd ## YunoHost specific features @@ -47,7 +45,7 @@ You can configure CodiMD by editing this file `/var/www/codimd/config.json` usin ## Links * Report a bug: https://github.com/YunoHost-Apps/codimd_ynh/issues - * Upstream app repository: https://github.com/hedgedoc/hedgedoc + * Upstream app repository: https://github.com/hackmdio/codimd * YunoHost website: https://yunohost.org/ --- diff --git a/README_fr.md b/README_fr.md index 14f8566..b9a906d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble CodiMD est un service web de traitement de texte collaboratif en temps réel. Il utilise le langage Markdown. -**Version incluse :** 1.6.0 +**Version incluse :** 2.3.2 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 07c73b1..a30ec83 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/codimd/server/archive/1.6.0.tar.gz -SOURCE_SUM=5cb53b9441817f2e17f998057174f89213c96924d55b444bdaac35d0e48fab03 +SOURCE_URL=https://github.com/hackmdio/codimd/archive/refs/tags/2.3.2.tar.gz +SOURCE_SUM=aa1134ed283aec23e99ae3557541e183f342031e6728d1045ec5c3b2d32b2e5f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index dce2919..6b69d8d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "Collaborative editor to work on notes written in Markdown", "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" }, - "version": "1.6.0~ynh7", - "url": "https://github.com/codimd/server", + "version": "2.3.2~ynh1", + "url": "https://github.com/hackmdio/codimd", "license": "AGPL-3.0-only", "maintainer": { "name": "liberodark" }, "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -24,29 +24,17 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for CodiMD", - "fr": "Choisissez un nom de domaine pour CodiMD" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for CodiMD", - "fr": "Choisissez un chemin pour CodiMD" - }, "example": "/codimd", "default": "/codimd" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public site?", - "fr": "Est-ce un site public ?" - }, "help": { "en": "If enabled, CodiMD 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, CodiMD 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 b16fe61..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/codimd_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/codimd_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/_common.sh b/scripts/_common.sh index 327e730..3e0b194 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql apt-transport-https" -nodejs_version=12 +nodejs_version=14 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index c7ae21b..9c779ba 100644 --- a/scripts/install +++ b/scripts/install @@ -47,7 +47,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 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 #================================================= # STANDARD MODIFICATIONS @@ -196,9 +195,7 @@ 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" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c23925f..60eed03 100644 --- 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) port=$(ynh_app_setting_get --app=$app --key=port) @@ -33,6 +32,18 @@ ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# 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 #=================================================