1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/cryptpad_ynh.git synced 2024-09-03 18:26:14 +02:00

Merge pull request #103 from YunoHost-Apps/4.10.0

4.10.0
This commit is contained in:
Éric Gaspar 2021-08-17 15:44:53 +02:00 committed by GitHub
commit 84bc275b7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 10 deletions

View file

@ -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/

View file

@ -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/

View file

@ -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

View file

@ -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

View file

@ -118,15 +118,50 @@ 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.
*/
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
* 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
* ===================== */

View file

@ -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",

View file

@ -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: [