From 0f8f57a74200c1308dd7abfb3d3ae95622b86f89 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 31 Mar 2021 10:24:57 +0200 Subject: [PATCH 1/9] Upgrade to 4.3.1 --- README.md | 4 ++-- README_fr.md | 4 ++-- check_process | 1 - conf/app.src | 6 +++--- manifest.json | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a5357ef..dfb1cd9 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ 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.3.0 +**Shipped version:** 4.3.1 ## Screenshots -![](https://github.com/xwiki-labs/cryptpad/raw/master/screenshot.png) +![](https://github.com/xwiki-labs/cryptpad/raw/main/screenshot.png) ## Demo diff --git a/README_fr.md b/README_fr.md index 45050d1..629bbc6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,11 +11,11 @@ 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.3.0 +**Version incluse :** 4.3.1 ## Captures d'écran -![](https://github.com/xwiki-labs/cryptpad/raw/master/screenshot.png) +![](https://github.com/xwiki-labs/cryptpad/raw/main/screenshot.png) ## Démo diff --git a/check_process b/check_process index 2afd349..b2cbdf5 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,6 @@ upgrade=1 from_commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 backup_restore=1 multi_instance=0 - port_already_use=1 change_url=1 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index 0beb845..aaf723e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.3.0.tar.gz -SOURCE_SUM=aefa5853981b11853aad60439071fa9e3b5e5fd0642cb48adf7cd1e8133dc8f5 +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.3.1.tar.gz +SOURCE_SUM=7d4d3652e911b5f78439c7b2deea48ad0df179a633dc4e9d229aeb0714c1a3d2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-4.3.0.tar.gz +SOURCE_FILENAME=cryptpad-4.3.1.tar.gz diff --git a/manifest.json b/manifest.json index ec3e855..af396a7 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.3.0~ynh1", + "version": "4.3.1~ynh1", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-only", "maintainer": { From 791668b475352a6cd7cfcc6e8d3f3d76b16b1b55 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 31 Mar 2021 15:25:51 +0200 Subject: [PATCH 2/9] Update check_process --- check_process | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/check_process b/check_process index b2cbdf5..cf77ee1 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,10 @@ setup_private=1 setup_public=1 upgrade=1 + #3.24.0 upgrade=1 from_commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 + #4.2.1 + upgrade=1 from_commit=5d014c575a90c0561384faf90172336308d72085 backup_restore=1 multi_instance=0 change_url=1 @@ -22,5 +25,7 @@ Notification=none ;;; Upgrade options ; commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 name=update to 3.24.0 + ; commit=5d014c575a90c0561384faf90172336308d72085 + name=update to 4.2.1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& \ No newline at end of file From f604fc7179b1ae40226109df1da7e4671901be02 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 31 Mar 2021 16:46:47 +0200 Subject: [PATCH 3/9] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 63904b4..74e6435 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,6 +120,7 @@ ynh_script_progression --message="Building CryptPad... (this will take some time pushd "$final_path" || ynh_die ynh_exec_warn_less bower update --allow-root + ynh_exec_warn_less npm i popd || ynh_die #================================================= From 79fb8c77be0e7a3c9d5c042882a0319cc40a19c7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 31 Mar 2021 16:55:57 +0200 Subject: [PATCH 4/9] Update check_process --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index cf77ee1..1a12a1e 100644 --- a/check_process +++ b/check_process @@ -15,7 +15,7 @@ #3.24.0 upgrade=1 from_commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 #4.2.1 - upgrade=1 from_commit=5d014c575a90c0561384faf90172336308d72085 + upgrade=1 from_commit=73e59b684627584a6416eb1460ce10c5ee41dec3 backup_restore=1 multi_instance=0 change_url=1 @@ -25,7 +25,7 @@ Notification=none ;;; Upgrade options ; commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 name=update to 3.24.0 - ; commit=5d014c575a90c0561384faf90172336308d72085 + ; commit=73e59b684627584a6416eb1460ce10c5ee41dec3 name=update to 4.2.1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& \ No newline at end of file From 410cc7f9374afe56efcbdd7f4d044f6490db710c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 31 Mar 2021 18:20:28 +0200 Subject: [PATCH 5/9] Update check_process --- check_process | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check_process b/check_process index 1a12a1e..73890c1 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,8 @@ upgrade=1 from_commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 #4.2.1 upgrade=1 from_commit=73e59b684627584a6416eb1460ce10c5ee41dec3 + #4.2.1 #73 + upgrade=1 from_commit=7928da66361c55742013d599e32819a30c8f7a08 backup_restore=1 multi_instance=0 change_url=1 @@ -27,5 +29,7 @@ Notification=none name=update to 3.24.0 ; commit=73e59b684627584a6416eb1460ce10c5ee41dec3 name=update to 4.2.1 + ; commit=7928da66361c55742013d599e32819a30c8f7a08 + name=update to 4.2.1 #73 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& \ No newline at end of file From 0a7fb22aa893eb848f61f2c74ebf0f7bfd0f4b10 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Apr 2021 11:01:26 +0200 Subject: [PATCH 6/9] Update config.js --- conf/config.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conf/config.js b/conf/config.js index 75f1ac9..8ffc643 100644 --- a/conf/config.js +++ b/conf/config.js @@ -45,6 +45,14 @@ module.exports = { * In such a case this should be also handled by NGINX, as documented in * cryptpad/docs/example.nginx.conf (see the $main_domain variable) * + * Note: you may provide multiple origins for the purpose of accessing + * a development instance via different URLs, like so: + * httpUnsafeOrigin: 'http://127.0.0.1:3000/ http://localhost:3000/', + * + * Such configuration is not recommended for production instances, + * as the development team does not actively test such configuration + * and it may have unintended consequences in practice. + * */ httpUnsafeOrigin: 'http://127.0.0.1:__PORT__', @@ -295,6 +303,8 @@ module.exports = { */ blobStagingPath: './data/blobstage', + decreePath: './data/decrees', + /* CryptPad supports logging events directly to the disk in a 'logs' directory * Set its location here, or set it to false (or nothing) if you'd rather not log */ From f0ab289930a929e34060b77959d80da50457f745 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Apr 2021 11:31:21 +0200 Subject: [PATCH 7/9] Update check_process --- check_process | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/check_process b/check_process index 73890c1..7e0215d 100644 --- a/check_process +++ b/check_process @@ -14,10 +14,12 @@ upgrade=1 #3.24.0 upgrade=1 from_commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 - #4.2.1 - upgrade=1 from_commit=73e59b684627584a6416eb1460ce10c5ee41dec3 - #4.2.1 #73 - upgrade=1 from_commit=7928da66361c55742013d599e32819a30c8f7a08 + #4.0.0 + upgrade=1 from_commit=4b43c2fd8731a9d08196c4d1b688922ff6b39f00 + #4.1.0 + upgrade=1 from_commit=b0dd9be98e3cfedec24d3910058682b36e3fedda + #4.2.0 + upgrade=1 from_commit=63f434a721fdea008ff5171b18131afa8d47c140 backup_restore=1 multi_instance=0 change_url=1 @@ -27,9 +29,11 @@ Notification=none ;;; Upgrade options ; commit=ddbb3b36b8bcd00e573456bd9ad07b1aa5e41cb1 name=update to 3.24.0 - ; commit=73e59b684627584a6416eb1460ce10c5ee41dec3 - name=update to 4.2.1 - ; commit=7928da66361c55742013d599e32819a30c8f7a08 - name=update to 4.2.1 #73 + ; commit=4b43c2fd8731a9d08196c4d1b688922ff6b39f00 + name=update to 4.0.0 + ; commit=b0dd9be98e3cfedec24d3910058682b36e3fedda + name=update to 4.1.0 + ; commit=63f434a721fdea008ff5171b18131afa8d47c140 + name=update to 4.2.0 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& \ No newline at end of file From 11f64d26dc012857c99b1443d3e6039eb10fe84e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Apr 2021 14:35:55 +0200 Subject: [PATCH 8/9] Update change_url --- scripts/change_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index c2027c0..6c5d113 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -17,7 +17,7 @@ old_domain=$YNH_APP_OLD_DOMAIN old_path=$YNH_APP_OLD_PATH new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH +new_path="/" app=$YNH_APP_INSTANCE_NAME From fcc245d302df72a51c0c1da0f15ba4701d15ab20 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 18:12:49 +0200 Subject: [PATCH 9/9] Fix badges --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dfb1cd9..4882724 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ CryptPad is a collaborative encrypted document editor in real time. It is a priv #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cryptpad%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/cryptpad/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cryptpad%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cryptpad/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps.yunohost.org/ci/apps/cryptpad/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cryptpad/) ## Limitations diff --git a/README_fr.md b/README_fr.md index 629bbc6..5717ef3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -39,8 +39,8 @@ Comment configurer cette application : via le panneau d'administration ainsi que #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cryptpad%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/cryptpad/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cryptpad%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cryptpad/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps.yunohost.org/ci/apps/cryptpad/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/cryptpad.svg)](https://ci-apps-arm.yunohost.org/ci/apps/cryptpad/) ## Limitations