From 72997aaa4656ae1db5791a29fc2bebba7f3dc632 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 9 Sep 2021 10:51:09 +0200 Subject: [PATCH] 4.11.0 --- check_process | 12 ++++-------- conf/app.src | 6 +++--- doc/DISCLAIMER.md | 10 +++++++++- doc/DISCLAIMER_fr.md | 10 +++++++++- manifest.json | 2 +- scripts/install | 4 ++-- scripts/upgrade | 2 -- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/check_process b/check_process index 456fe40..25f6bb5 100644 --- a/check_process +++ b/check_process @@ -12,10 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - #4.6.0 - upgrade=1 from_commit=198d9d2bbdb131354f4d8ba3179021de9e58a75a - #4.9.0 - upgrade=1 from_commit=c61a2ee40b5ef747219793a6cc5a409f366c8a94 + #4.10.0 + upgrade=1 from_commit=2a54cd03f90c93b07150a64644ffc7f208110a18 backup_restore=1 multi_instance=0 change_url=1 @@ -23,9 +21,7 @@ Email= Notification=none ;;; Upgrade options - ; commit=198d9d2bbdb131354f4d8ba3179021de9e58a75a - name=update to 4.6.0 - ; commit=c61a2ee40b5ef747219793a6cc5a409f366c8a94 - name=update to 4.9.0 + ; commit=2a54cd03f90c93b07150a64644ffc7f208110a18 + name=update to 4.10.0 \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 4c886f6..16af4c2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.10.0.tar.gz -SOURCE_SUM=0e55e5c2deff97e002bc570023e59e530df0fa5249836e75a8a3120e924c873e +SOURCE_URL=https://github.com/xwiki-labs/cryptpad/archive/4.11.0.tar.gz +SOURCE_SUM=e529b484c297f73227f991971189c51f64da1ab53fc78334d1fb08e320d4385e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=cryptpad-4.10.0.tar.gz +SOURCE_FILENAME=cryptpad-4.11.0.tar.gz diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 4debaed..bdc64b0 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,3 +1,11 @@ ## Configuration -* How to configure this app: From the admin panel and the plain file `/var/www/cryptpad/config/config.js.` +Once CryptPad is installed, create an account via the Register button on the home page. To make this account an instance administrator: + +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: [ + "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]", +], +``` diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index e1d24cc..ca9d712 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,3 +1,11 @@ ## Configuration -Comment configurer cette application : via le panneau d'administration ainsi que le fichier de configuration `/var/www/cryptpad/config/config.js`. +Une fois CryptPad installé, créez un compte via le bouton S'inscrire sur la page d'accueil. Pour faire de ce compte un administrateur d'instance : + +1. Copiez la clé publique trouvée dans le menu utilisateur (avatar en haut à droite) > Paramètres > Compte > Clé de signature publique +2. Collez cette clé dans `/var/www/cryptpad/config/config.js` dans le tableau suivant (décommentez et remplacez l'espace réservé) : +``` +adminKeys: [ + "[cryptpad-user1@my.awesome.website/YZgXQxKR0Rcb6r6CmxHPdAGLVludrAF2lEnkbx1vVOo=]", +], +``` diff --git a/manifest.json b/manifest.json index bddfa68..5e3db52 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.10.0~ynh1", + "version": "4.11.0~ynh1", "url": "https://cryptpad.fr/", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/install b/scripts/install index a1ea092..976e493 100644 --- a/scripts/install +++ b/scripts/install @@ -124,12 +124,12 @@ chown $app "$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 +pushd "$final_path" ynh_use_nodejs ynh_exec_warn_less npm install --allow-root ynh_exec_warn_less npm install -g bower ynh_exec_warn_less bower install --allow-root -popd || ynh_die +popd #================================================= # INTEGRATE SERVICE IN YUNOHOST diff --git a/scripts/upgrade b/scripts/upgrade index a099580..5578f0d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,7 +93,6 @@ then chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$final_path" - chmod 600 "$final_path/config/config.js" fi #================================================= @@ -136,7 +135,6 @@ popd ynh_script_progression --message="Upgrading systemd configuration..." --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" # Create a dedicated systemd config ynh_add_systemd_config