From d2809a73b94cadb7c6dae78a38fe590165bbb381 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Dec 2020 11:33:12 +0100 Subject: [PATCH 01/12] Fix linter warnings --- check_process | 3 --- manifest.json | 4 ++++ scripts/install | 7 ++----- scripts/remove | 2 +- scripts/restore | 5 +++-- scripts/upgrade | 9 +++++++-- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/check_process b/check_process index e9d48a1..91d59fd 100644 --- a/check_process +++ b/check_process @@ -19,9 +19,6 @@ incorrect_path=0 port_already_use=1 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/manifest.json b/manifest.json index 673d76b..dbaca8d 100644 --- a/manifest.json +++ b/manifest.json @@ -58,6 +58,10 @@ "en": "Is it a public site?", "fr": "Est-ce un site publique ?" }, + "help": { + "en": "If enabled, CryptPad 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, CryptPad sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + }, "default": true } ] diff --git a/scripts/install b/scripts/install index dfda1d5..07854a2 100644 --- a/scripts/install +++ b/scripts/install @@ -135,12 +135,10 @@ ynh_store_file_checksum "$final_path/config/config.js" ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 pushd "$final_path" || ynh_die - ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root yarn global add bower bower install --allow-root - popd || ynh_die #================================================= @@ -151,12 +149,11 @@ ynh_script_progression --message="Securing files and directories..." --weight=1 chown -R $app:$app $final_path #================================================= -# INTEGRATE SERVICE IN ADMIN PANEL +# INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -# Ajoute le service au monitoring de Yunohost. -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/remove b/scripts/remove index 84d6a3f..8ae9496 100644 --- a/scripts/remove +++ b/scripts/remove @@ -26,7 +26,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing CryptPad service..." --weight=3 diff --git a/scripts/restore b/scripts/restore index 0a435f9..cb631dc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,13 +89,14 @@ ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ st ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Zero Knowledge realtime collaborative editor" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 7ebfc40..bad4cf5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -146,12 +146,10 @@ ynh_store_file_checksum "$final_path/config/config.js" ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 pushd "$final_path" || ynh_die - ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root yarn global add bower bower install --allow-root - popd || ynh_die #================================================= @@ -175,6 +173,13 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Set permissions on app files chown -R $app:$app $final_path +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= +ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 + +yunohost service add $app --description="Zero Knowledge realtime collaborative editor" --log="/var/log/$app/$app.log" + #================================================= # START SYSTEMD SERVICE #================================================= From 3e6b6bec7f7eada1ea9ba85b689715344ce7a679 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 14 Dec 2020 10:19:20 +0100 Subject: [PATCH 02/12] Fix --- check_process | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 91d59fd..43e3ba7 100644 --- a/check_process +++ b/check_process @@ -7,7 +7,7 @@ is_public="1" (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 - setup_sub_dir=0 + setup_sub_dir=1 setup_root=1 setup_nourl=0 setup_private=1 diff --git a/manifest.json b/manifest.json index dbaca8d..966eed1 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": "3.24.0~ynh1", + "version": "3.24.0~ynh2", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-or-later", "maintainer": { From 1d64f1cef66c0bf61d1f975654f9c9e635a39cc7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 15 Dec 2020 12:54:13 +0100 Subject: [PATCH 03/12] Upgrade to v.3.25.0 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 6 +++--- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 617d64b..3ec7a2f 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:** 3.24.0 +**Shipped version:** 3.25.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index df2ea28..763d378 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 :** 3.24.0 +**Version incluse :** 3.25.0 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index e150c5f..17a6a66 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/3.24.0.tar.gz -SOURCE_SUM=d662fa81a840db617f3892fbec193c413d502c4d83a02f5f05777e64f32c150c +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/3.25.0.tar.gz +SOURCE_SUM=8a1d57230f9448b5e2963aab19dcbb5627e1b92c2e56510348def762aa19cb13 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-3.24.0.tar.gz +SOURCE_FILENAME=cryptpad-3.25.0.tar.gz diff --git a/manifest.json b/manifest.json index 966eed1..3061800 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": "3.24.0~ynh2", + "version": "3.25.0~ynh1", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-or-later", "maintainer": { From fb30aa31c8bc4b71912c0e21d702edc5ebeadbf9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 15 Dec 2020 13:12:03 +0100 Subject: [PATCH 04/12] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 43e3ba7..91d59fd 100644 --- a/check_process +++ b/check_process @@ -7,7 +7,7 @@ is_public="1" (PUBLIC|public=1|private=0) ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 setup_private=1 From f2490f45794eef82aa08de3d36200649ffd82e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Dec 2020 23:01:43 +0100 Subject: [PATCH 05/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ec7a2f..ac4c93f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # CryptPad for YunoHost [![Integration level](https://dash.yunohost.org/integration/cryptpad.svg)](https://dash.yunohost.org/appci/app/cryptpad) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.maintain.svg) -[![Install CryptPad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=cryptpad) +[![Install CryptPad with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cryptpad) *[Lire ce readme en français.](./README_fr.md)* From e6d5cdc4d2d13e8e96a2de91f18d5353a5a70e0a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Dec 2020 15:33:53 +0100 Subject: [PATCH 06/12] Update README_fr.md --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 763d378..2df9259 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # CryptPad pour YunoHost [![Integration level](https://dash.yunohost.org/integration/cryptpad.svg)](https://dash.yunohost.org/appci/app/cryptpad) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/cryptpad.maintain.svg) -[![Installer CryptPad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=cryptpad) +[![Installer CryptPad avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cryptpad) *[Read this readme in english.](./README.md)* From 4c531230338d026b90872cfaad4ca9709bc7fd00 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Dec 2020 15:34:22 +0100 Subject: [PATCH 07/12] Update install --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 07854a2..f0e5616 100644 --- a/scripts/install +++ b/scripts/install @@ -137,8 +137,6 @@ ynh_script_progression --message="Building CryptPad... (this will take some time pushd "$final_path" || ynh_die ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root - yarn global add bower - bower install --allow-root popd || ynh_die #================================================= From cd9ca7cd48e4cc6bb5155c90817a94a1338f49e2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Dec 2020 15:37:24 +0100 Subject: [PATCH 08/12] Update upgrade --- scripts/upgrade | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index bad4cf5..9a5530d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -148,8 +148,6 @@ ynh_script_progression --message="Building CryptPad... (this will take some time pushd "$final_path" || ynh_die ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root - yarn global add bower - bower install --allow-root popd || ynh_die #================================================= From e66b640a8b427da37c68f6f734a3583d6ebfe636 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Dec 2020 15:53:15 +0100 Subject: [PATCH 09/12] Update issue_template.md --- issue_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/issue_template.md b/issue_template.md index bc9ad5f..cb868a9 100644 --- a/issue_template.md +++ b/issue_template.md @@ -20,7 +20,7 @@ about: Create a report to help us debug, it would be nice to fill the template a - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info cryptpad`* From aa1823bb910f0aa6543b846052e06e8ceeaf91aa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Dec 2020 17:30:31 +0100 Subject: [PATCH 10/12] add bower --- scripts/install | 2 ++ scripts/upgrade | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index f0e5616..07854a2 100644 --- a/scripts/install +++ b/scripts/install @@ -137,6 +137,8 @@ ynh_script_progression --message="Building CryptPad... (this will take some time pushd "$final_path" || ynh_die ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root + yarn global add bower + bower install --allow-root popd || ynh_die #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9a5530d..bad4cf5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -148,6 +148,8 @@ ynh_script_progression --message="Building CryptPad... (this will take some time pushd "$final_path" || ynh_die ynh_use_nodejs ynh_exec_warn_less yarn install --allow-root + yarn global add bower + bower install --allow-root popd || ynh_die #================================================= From 368cc6384f116596e92fac1535c293bdcf0abb4c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 3 Jan 2021 23:57:43 +0100 Subject: [PATCH 11/12] revert --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 6 +++--- manifest.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ac4c93f..c40c64a 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:** 3.25.0 +**Shipped version:** 3.24.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2df9259..4e199c2 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 :** 3.25.0 +**Version incluse :** 3.24.0 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 17a6a66..e150c5f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/3.25.0.tar.gz -SOURCE_SUM=8a1d57230f9448b5e2963aab19dcbb5627e1b92c2e56510348def762aa19cb13 +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/3.24.0.tar.gz +SOURCE_SUM=d662fa81a840db617f3892fbec193c413d502c4d83a02f5f05777e64f32c150c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-3.25.0.tar.gz +SOURCE_FILENAME=cryptpad-3.24.0.tar.gz diff --git a/manifest.json b/manifest.json index 3061800..dbaca8d 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": "3.25.0~ynh1", + "version": "3.24.0~ynh1", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-or-later", "maintainer": { From 990e8e603600ea749758e64f87d11e7380b8f3e9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 4 Jan 2021 09:07:03 +0100 Subject: [PATCH 12/12] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index dbaca8d..8275860 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version": "3.24.0~ynh1", "url": "https://cryptpad.fr/", - "license": "AGPL-3.0-or-later", + "license": "AGPL-3.0-only", "maintainer": { "name": "frju365", "email": "win10@tutanota.com",