From 54911d044b5af373cca0de247312bd39703fbd1a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 7 Jul 2021 12:56:15 +0200 Subject: [PATCH 1/7] 4.8.0 --- conf/app.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index d60aa4a..c0b6d7a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.7.0.tar.gz -SOURCE_SUM=33f7a352b034ef12ee9e588896c11b7bc18a3ed216c864798d1d17da5debc982 +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.8.0.tar.gz +SOURCE_SUM=f95b97769d3a69a6e687f298240813e96ef12ea24254a0e246931c3e5f71a4b7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-4.7.0.tar.gz +SOURCE_FILENAME=cryptpad-4.8.0.tar.gz From c9cbe845bc249a98f6b849172bafc31be14afefb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 7 Jul 2021 13:07:57 +0200 Subject: [PATCH 2/7] Update config.js --- conf/config.js | 83 ++++++-------------------------------------------- 1 file changed, 10 insertions(+), 73 deletions(-) diff --git a/conf/config.js b/conf/config.js index 8ffc643..462d980 100644 --- a/conf/config.js +++ b/conf/config.js @@ -122,55 +122,6 @@ module.exports = { ], */ - /* CryptPad's administration panel includes a "support" tab - * wherein administrators with a secret key can view messages - * sent from users via the encrypted forms on the /support/ page - * - * To enable this functionality: - * run `node ./scripts/generate-admin-keys.js` - * save the public key in your config in the value below - * add the private key via the admin panel - * and back it up in a secure manner - * - */ - // supportMailboxPublicKey: "", - - /* We're very proud that CryptPad is available to the public as free software! - * We do, however, still need to pay our bills as we develop the platform. - * - * By default CryptPad will prompt users to consider donating to - * our OpenCollective campaign. We publish the state of our finances periodically - * so you can decide for yourself whether our expenses are reasonable. - * - * You can disable any solicitations for donations by setting 'removeDonateButton' to true, - * but we'd appreciate it if you didn't! - */ - removeDonateButton: true, - - /* CryptPad will display a point of contact for your instance on its contact page - * (/contact.html) if you provide it below. - */ - adminEmail: '__EMAIL__', - - /* - * By default, CryptPad contacts one of our servers once a day. - * This check-in will also send some very basic information about your instance including its - * version and the adminEmail so we can reach you if we are aware of a serious problem. - * We will never sell it or send you marketing mail. - * - * If you want to block this check-in and remain set 'blockDailyCheck' to true. - */ - blockDailyCheck: true, - - /* - * By default users get 50MB of storage by registering on an instance. - * You can set this value to whatever you want. - * - * hint: 50MB is 50 * 1024 * 1024 - */ - //defaultStorageLimit: 50 * 1024 * 1024, - - /* ===================== * STORAGE * ===================== */ @@ -226,29 +177,6 @@ module.exports = { */ //maxUploadSize: 20 * 1024 * 1024, - /* - * CryptPad allows administrators to give custom limits to their friends. - * add an entry for each friend, identified by their user id, - * which can be found on the settings page. Include a 'limit' (number of bytes), - * a 'plan' (string), and a 'note' (string). - * - * hint: 1GB is 1024 * 1024 * 1024 bytes - */ -/* - customLimits: { - "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]": { - limit: 20 * 1024 * 1024 * 1024, - plan: 'insider', - note: 'storage space donated by my.awesome.website' - }, - "[cryptpad-user2@my.awesome.website/GdflkgdlkjeworijfkldfsdflkjeEAsdlEnkbx1vVOo=]": { - limit: 10 * 1024 * 1024 * 1024, - plan: 'insider', - note: 'storage space donated by my.awesome.website' - } - }, -*/ - /* Users with premium accounts (those with a plan included in their customLimit) * can benefit from an increased upload size limit. By default they are restricted to the same * upload size as any other registered user. @@ -348,4 +276,13 @@ module.exports = { * (false by default) */ verbose: false, -}; + + /* Surplus information: + * + * 'installMethod' is included in server telemetry to voluntarily + * indicate how many instances are using unofficial installation methods + * such as Docker. + * + */ + installMethod: 'unspecified', +}; \ No newline at end of file From f628a96f80a0805471a825f0f5139c40d6c73c24 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 7 Jul 2021 20:26:38 +0200 Subject: [PATCH 3/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 92286db..4f89677 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.7.0~ynh1", + "version": "4.8.0~ynh1", "url": "https://cryptpad.fr/", "upstream": { "license": "AGPL-3.0-only", From cc2f2e969b36365dd298613e0b181fab8e618f22 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 7 Jul 2021 18:37:28 +0000 Subject: [PATCH 4/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1030d9e..16b2df8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Zero Knowledge realtime collaborative editor -**Shipped version:** 4.7.0~ynh1 +**Shipped version:** 4.8.0~ynh1 **Demo:** https://cryptpad.fr/ diff --git a/README_fr.md b/README_fr.md index 93a14e7..6eb01f0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Éditeur chiffré collaboratif en temps réel. -**Version incluse :** 4.7.0~ynh1 +**Version incluse :** 4.8.0~ynh1 **Démo :** https://cryptpad.fr/ From a2c1da548e1e70a51d3fb9e9782b40cb3c3ec17b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 7 Jul 2021 23:48:23 +0200 Subject: [PATCH 5/7] Update config.js --- conf/config.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/config.js b/conf/config.js index 462d980..125f152 100644 --- a/conf/config.js +++ b/conf/config.js @@ -122,6 +122,11 @@ module.exports = { ], */ + /* CryptPad will display a point of contact for your instance on its contact page + * (/contact.html) if you provide it below. + */ + adminEmail: '__EMAIL__', + /* ===================== * STORAGE * ===================== */ From 3f0363052b352ffa840d5ae98f180b4e4ffef9e9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 8 Jul 2021 00:03:11 +0200 Subject: [PATCH 6/7] Update config.js --- conf/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.js b/conf/config.js index 125f152..73e8607 100644 --- a/conf/config.js +++ b/conf/config.js @@ -54,7 +54,7 @@ module.exports = { * and it may have unintended consequences in practice. * */ - httpUnsafeOrigin: 'http://127.0.0.1:__PORT__', + httpUnsafeOrigin: 'https://127.0.0.1:__PORT__', /* httpSafeOrigin is the URL that is used for the 'sandbox' described above. * If you're testing or developing with CryptPad on your local machine then @@ -126,7 +126,7 @@ module.exports = { * (/contact.html) if you provide it below. */ adminEmail: '__EMAIL__', - + /* ===================== * STORAGE * ===================== */ From 2838fa9fc14dd26c529fedd8b37022aa131c450b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 8 Jul 2021 00:04:31 +0200 Subject: [PATCH 7/7] Update config.js --- conf/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.js b/conf/config.js index 73e8607..94ff042 100644 --- a/conf/config.js +++ b/conf/config.js @@ -54,7 +54,7 @@ module.exports = { * and it may have unintended consequences in practice. * */ - httpUnsafeOrigin: 'https://127.0.0.1:__PORT__', + httpUnsafeOrigin: 'https://__DOMAIN__', /* httpSafeOrigin is the URL that is used for the 'sandbox' described above. * If you're testing or developing with CryptPad on your local machine then