From 2719b58e3f416bb02ef169870f4c7f5a756d6164 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:54:02 +0000 Subject: [PATCH 1/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f3fcddf..c715689 100644 --- a/scripts/install +++ b/scripts/install @@ -210,7 +210,7 @@ fi #================================================= # RELOAD YUNOHOST-API to refresh web admin domains after domain creation (normal?) #================================================= -ynh_systemd_action --service_name=yunohost-api --action=reload +#ynh_systemd_action --service_name=yunohost-api --action=reload #================================================= # RELOAD NGINX From cca4ce6729623ccbfca3f85190cc521319a25e29 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Mon, 13 Feb 2023 14:25:59 +0000 Subject: [PATCH 2/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c715689..123cb26 100644 --- a/scripts/install +++ b/scripts/install @@ -175,7 +175,7 @@ yunohost service add $app --description="Zero Knowledge realtime collaborative e ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="server available" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # SETUP SSOWAT From 3ea34cd4b0e479b18538b0bf1c0dae022a6d0755 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Mon, 13 Feb 2023 15:21:21 +0000 Subject: [PATCH 3/6] Update install --- scripts/install | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/install b/scripts/install index 123cb26..883a1e8 100644 --- a/scripts/install +++ b/scripts/install @@ -207,11 +207,6 @@ if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then ynh_add_config --template="/etc/nginx/conf.d/$domain.d/cryptpad.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/cryptpad.conf" fi -#================================================= -# RELOAD YUNOHOST-API to refresh web admin domains after domain creation (normal?) -#================================================= -#ynh_systemd_action --service_name=yunohost-api --action=reload - #================================================= # RELOAD NGINX #================================================= From c2516d11cb27a38c5f999772094571685deadf0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Feb 2023 17:27:00 +0100 Subject: [PATCH 4/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 04b968a..e89e4e9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Zero Knowledge realtime collaborative office suite", "fr": "Suite bureautique chiffrée pour la collaboration en temps réel" }, - "version": "5.2.1~ynh1", + "version": "5.2.1~ynh2", "url": "https://cryptpad.fr/", "upstream": { "license": "AGPL-3.0-only", From da2e84f095d33abe776e715f593acc2983cb48e1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 Feb 2023 16:27:05 +0000 Subject: [PATCH 5/6] 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 09a9d66..a348290 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in CryptPad is a collaboration suite that is end-to-end-encrypted and open-source. It is built to enable collaboration, synchronizing changes to documents in real time. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored. -**Shipped version:** 5.2.1~ynh1 +**Shipped version:** 5.2.1~ynh2 **Demo:** https://cryptpad.fr/ diff --git a/README_fr.md b/README_fr.md index 0d97673..ce6f8db 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po CryptPad est une suite de collaboration chiffrée de bout en bout et open source. Il est conçu pour permettre la collaboration, en synchronisant les modifications apportées aux documents en temps réel. Étant donné que toutes les données sont chiffrées, le service et ses administrateurs n'ont aucun moyen de voir le contenu modifié et stocké. -**Version incluse :** 5.2.1~ynh1 +**Version incluse :** 5.2.1~ynh2 **Démo :** https://cryptpad.fr/ From 4db9114bbd5993a2e9fe76085055a39ff19f14bb Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 15 Feb 2023 15:59:35 +0100 Subject: [PATCH 6/6] don't keep customize folder The files are different in this release, it is better not keep old files... --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4d1d69d..2d0e277 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -90,7 +90,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="config/config.js customize/" + ynh_setup_source --dest_dir="$final_path" --keep="config/config.js" chmod 750 "$final_path" chmod -R o-rwx "$final_path"