From df96242c0a7da6a927c4cb4ba6f177e8345b5ba5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 25 Jan 2021 12:24:24 +0100 Subject: [PATCH 1/2] Stat the need of dedicated domain --- manifest.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6d1e6db..fc0fb4a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Zero Knowledge realtime collaborative editor", "fr": "Éditeur chiffré collaboratif en temps réel." }, - "version": "4.0.0~ynh2", + "version": "4.0.0~ynh3", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-only", "maintainer": { @@ -30,6 +30,10 @@ "en": "Choose a domain name for CryptPad", "fr": "Choisissez un nom de domaine pour CryptPad" }, + "help": { + "en": "CryptPad needs to be installed in a dedicated domain or sub-domain.", + "fr": "CryptPad doit être installé dans un domaine ou sous-domaine dédié." + }, "example": "cryptpad.example.com" }, { From ffb396460dbded6fbeeecebda180f8da621656fb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 10 Feb 2021 14:53:57 +0100 Subject: [PATCH 2/2] Upgrade to version 4.1.0 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 6 +++--- manifest.json | 2 +- pull_request_template.md | 4 ++++ scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 7 +++++++ 9 files changed, 20 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a10a49a..51bd72d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview CryptPad is a collaborative encrypted document editor in real time. It is a privacy-friendly alternative to popular office tools and cloud services. All content stored in CryptPad is encrypted before being sent, which means that no one can access your data unless you give them the keys. You can share access to a document simply by sharing the link. -**Shipped version:** 4.0.0 +**Shipped version:** 4.1.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 37c7f9e..2e7b69c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble CryptPad est un éditeur de documents chiffrés collaboratifs en temps réel. C'est une alternative respectant la vie privée aux outils office et aux services cloud populaires. Tout le contenu stocké dans CryptPad est chiffré avant d'être envoyé, ce qui signifie que personne ne peut accéder à vos données à moins que vous ne leur donniez les clés. Vous pouvez partager l'accès à un document simplement en partageant le lien. -**Version incluse :** 4.0.0 +**Version incluse :** 4.1.0 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 023e1e5..25dbb8d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.0.0.tar.gz -SOURCE_SUM=74845b9f0d80104cae69db90656cf95bba2d299cc2892bd58a996c87e3578d88 +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.1.0.tar.gz +SOURCE_SUM=1b5ad7536532e504108bbdceb9c53c8ae116a7cd74185d9cbad0ee7929d423e2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-4.0.0.tar.gz +SOURCE_FILENAME=cryptpad-4.1.0.tar.gz diff --git a/manifest.json b/manifest.json index fc0fb4a..af83e5a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Zero Knowledge realtime collaborative editor", "fr": "Éditeur chiffré collaboratif en temps réel." }, - "version": "4.0.0~ynh3", + "version": "4.1.0~ynh1", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-only", "maintainer": { diff --git a/pull_request_template.md b/pull_request_template.md index 69ce5a0..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -10,3 +10,7 @@ - [ ] Fix or enhancement tested. - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. + +## Package_check results +--- +* 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/change_url b/scripts/change_url index eab8900..c2027c0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -107,7 +107,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="server available" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server available" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 94bef7b..26e475b 100644 --- a/scripts/install +++ b/scripts/install @@ -163,7 +163,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." --weight=1 +ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary if [ $is_public -eq 1 ] diff --git a/scripts/restore b/scripts/restore index be98399..adde845 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,7 +100,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="server available" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 3d417e8..72813a0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -51,6 +51,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 #=================================================