From 884459c7387bcbd84d66ec3fda5569369736c361 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Apr 2021 19:37:14 +0200 Subject: [PATCH 1/6] Fix link --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5b60919..c5a83c8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allows you to install CryptPad quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## 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. diff --git a/README_fr.md b/README_fr.md index 901af89..7af3a80 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,7 +6,7 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer CryptPad rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.* ## 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. From 8828898e4b97d95780cadd4aab98b6cbdd8c79ff Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Apr 2021 19:38:38 +0200 Subject: [PATCH 2/6] Update upgrade --- scripts/upgrade | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 74e6435..ad8b48b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,10 +118,12 @@ ynh_add_config --template="../conf/config.js" --destination="$final_path/config/ #================================================= ynh_script_progression --message="Building CryptPad... (this will take some time and resources!)" --weight=60 -pushd "$final_path" || ynh_die +pushd "$final_path" + ynh_exec_warn_less npm install --allow-root + ynh_exec_warn_less npm install -g bower ynh_exec_warn_less bower update --allow-root ynh_exec_warn_less npm i -popd || ynh_die +popd #================================================= # SETUP SYSTEMD From fbfa00bb9e122c3cf3c2f3890f121fbaded99dca Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Apr 2021 20:25:01 +0200 Subject: [PATCH 3/6] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ad8b48b..d3fa48f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -139,7 +139,6 @@ ynh_add_systemd_config #================================================= # SECURE FILES AND DIRECTORIES #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Set permissions on app files chown -R $app: $final_path From bf636b40fda896d152405af92ea3c1bd51a51594 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Apr 2021 20:57:50 +0200 Subject: [PATCH 4/6] Update upgrade --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 74e6435..1cf905d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,7 +137,6 @@ ynh_add_systemd_config #================================================= # SECURE FILES AND DIRECTORIES #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Set permissions on app files chown -R $app: $final_path From d480d76839c9b7dc210c29566c0fa5b2513681f2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 25 Apr 2021 08:47:54 +0200 Subject: [PATCH 5/6] Update upgrade --- scripts/upgrade | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d3fa48f..8eb6fe1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,8 +87,20 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 + # Create a temporary directory + tmpdir="$(mktemp -d)" + + # Backup the config file in the temp dir + cp -a "$final_path/config/config.js" "$tmpdir/config.js" + # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" + + # Copy the admin saved settings from tmp directory to final path + cp -a "$tmpdir/config.js" "$final_path/config/config.js" + + # Remove the tmp directory securely + ynh_secure_remove --file="$tmpdir" fi #================================================= @@ -111,7 +123,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # CONFIGURE CONFIG.JS #================================================= -ynh_add_config --template="../conf/config.js" --destination="$final_path/config/config.js" +#ynh_add_config --template="../conf/config.js" --destination="$final_path/config/config.js" #================================================= # INSTALL CRYPTPAD From 29c47eff21ae083538cd53e28fab3a3c3cd9641a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 3 May 2021 17:40:36 +0200 Subject: [PATCH 6/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index b7906a6..fd750e3 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.4.0~ynh1", + "version": "4.4.0~ynh2", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-only", "maintainer": {