From a3632354f3878abc1308210c84c1b2a7c0d57a3a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Aug 2021 12:05:53 +0200 Subject: [PATCH 1/7] Upgrade to 4.10.0 --- check_process | 6 +++++- conf/app.src | 6 +++--- manifest.json | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index 4ebd9fe..456fe40 100644 --- a/check_process +++ b/check_process @@ -14,6 +14,8 @@ upgrade=1 #4.6.0 upgrade=1 from_commit=198d9d2bbdb131354f4d8ba3179021de9e58a75a + #4.9.0 + upgrade=1 from_commit=c61a2ee40b5ef747219793a6cc5a409f366c8a94 backup_restore=1 multi_instance=0 change_url=1 @@ -23,5 +25,7 @@ Notification=none ;;; Upgrade options ; commit=198d9d2bbdb131354f4d8ba3179021de9e58a75a name=update to 4.6.0 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + ; commit=c61a2ee40b5ef747219793a6cc5a409f366c8a94 + name=update to 4.9.0 + \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index f34dc17..4c886f6 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.9.0.tar.gz -SOURCE_SUM=f475122beeb23713fee0205f64440686667b477429262a38053c3afd3c829e90 +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.10.0.tar.gz +SOURCE_SUM=0e55e5c2deff97e002bc570023e59e530df0fa5249836e75a8a3120e924c873e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-4.9.0.tar.gz +SOURCE_FILENAME=cryptpad-4.10.0.tar.gz diff --git a/manifest.json b/manifest.json index f35590c..fd4a02f 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.9.0~ynh1", + "version": "4.10.0~ynh1", "url": "https://cryptpad.fr/", "upstream": { "license": "AGPL-3.0-only", From 8894888649bb1ac94581dc85e0b6c167fbd44dd9 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 17 Aug 2021 10:05:59 +0000 Subject: [PATCH 2/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 d18c2c5..b4bad34 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.9.0~ynh1 +**Shipped version:** 4.10.0~ynh1 **Demo:** https://cryptpad.fr/ diff --git a/README_fr.md b/README_fr.md index 470855e..28b1442 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.9.0~ynh1 +**Version incluse :** 4.10.0~ynh1 **Démo :** https://cryptpad.fr/ From 27ba3e8ec6c8ccf23ed674145d47f4924ceb01e8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Aug 2021 12:35:07 +0200 Subject: [PATCH 3/7] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index e992f7f..a1ea092 100644 --- a/scripts/install +++ b/scripts/install @@ -108,7 +108,6 @@ ynh_add_nginx_config ynh_script_progression --message="Configuring a systemd service..." --weight=1 ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service" -ynh_replace_string --match_string="__YNH_NPM__" --replace_string="$ynh_npm" --target_file="../conf/systemd.service" ynh_add_systemd_config @@ -118,6 +117,7 @@ ynh_add_systemd_config ynh_add_config --template="../conf/config.js" --destination="$final_path/config/config.js" chmod 600 "$final_path/config/config.js" +chown $app "$final_path/config/config.js" #================================================= # INSTALL CRYPTPAD @@ -175,7 +175,7 @@ Please open your $app domain: https://$domain$path_url Once CryptPad is installed, create an account via the Register button on the home page. To make this account an instance administrator: -1. Copy their public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key +1. Copy the public key found in User Menu (avatar at the top right) > Settings > Account > Public Signing Key 2. Paste this key in /var/www/cryptpad/config/config.js in the following array (uncomment and replace the placeholder): adminKeys: [ From 8d2e98a1b6395770ba644e9f9b95b486f2012251 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Aug 2021 13:59:46 +0200 Subject: [PATCH 4/7] Update config.js --- conf/config.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conf/config.js b/conf/config.js index 94ff042..025e9bf 100644 --- a/conf/config.js +++ b/conf/config.js @@ -127,6 +127,16 @@ module.exports = { */ 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, + /* ===================== * STORAGE * ===================== */ From ced02bf87c6bde43e99f884e66f3850e9b29c4ad Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Aug 2021 14:02:36 +0200 Subject: [PATCH 5/7] Update config.js --- conf/config.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/conf/config.js b/conf/config.js index 025e9bf..2e36083 100644 --- a/conf/config.js +++ b/conf/config.js @@ -127,6 +127,18 @@ module.exports = { */ adminEmail: '__EMAIL__', + /* 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, + /* * 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 From 93d888f43169a36dac2ca812b351f3c47d7115f2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 17 Aug 2021 14:50:28 +0200 Subject: [PATCH 6/7] Update config.js --- conf/config.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/conf/config.js b/conf/config.js index 2e36083..e3dd5ad 100644 --- a/conf/config.js +++ b/conf/config.js @@ -118,10 +118,23 @@ module.exports = { */ /* adminKeys: [ - //"[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]", + "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]", ], */ + /* 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: '', + /* CryptPad will display a point of contact for your instance on its contact page * (/contact.html) if you provide it below. */ From f25e2dd052eb02664f387b42eae58353f5fa021a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Aug 2021 10:09:48 +0200 Subject: [PATCH 7/7] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index f8350a0..aada9cb 100644 --- a/scripts/restore +++ b/scripts/restore @@ -36,8 +36,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=1 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path "