From fdc6d9c86d8c77819bf2575dc58224a84a6f2a8d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 9 Jan 2021 22:38:34 +0100 Subject: [PATCH 1/8] Finding an available port --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 07854a2..5b6954b 100644 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ admin_mail=$(ynh_user_get_info "$admin" 'mail') #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." --weight=1 +ynh_script_progression --message="Finding an available port..." --weight=1 # Find an available port port=$(ynh_find_port --port=3000) From ebdb0ce0e829a46032a4a64e545f3aeb4429c283 Mon Sep 17 00:00:00 2001 From: saimyx <44293594+Saimyx@users.noreply.github.com> Date: Tue, 19 Jan 2021 13:14:52 +0100 Subject: [PATCH 2/8] Update README.md Configuration and Limitations --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c40c64a..d137fb6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ CryptPad is a collaborative encrypted document editor in real time. It is a priv ## Configuration -* How to configure this app: From an admin panel, a plain file with SSH. +* How to configure this app: From the admin panel and the plain file `/var/www/cryptpad/config/config.js.` ## Documentation @@ -49,7 +49,7 @@ CryptPad is a collaborative encrypted document editor in real time. It is a priv ## Additional information -* To increase space for CryptPad users, you can modify `/var/www/cryptpad/config.js`, and restart the CryptPad service with `sudo service cryptpad restart`. +* To increase space for CryptPad users, you can modify `/var/www/cryptpad/config/config.js`, and restart the CryptPad service with `sudo service cryptpad restart`. ## Links From 57eab1790e32d085743755ce6b63dc42f827dd28 Mon Sep 17 00:00:00 2001 From: saimyx <44293594+Saimyx@users.noreply.github.com> Date: Tue, 19 Jan 2021 13:15:39 +0100 Subject: [PATCH 3/8] Update README_fr.md Configuration and Limitations --- README_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index 4e199c2..68928c0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ CryptPad est un éditeur de documents chiffrés collaboratifs en temps réel. C' ## Configuration -Comment configurer cette application : via le panneau d'administration ainsi que le fichier de configuration `/var/www/cryptpad/config.js`. +Comment configurer cette application : via le panneau d'administration ainsi que le fichier de configuration `/var/www/cryptpad/config/config.js`. ## Documentation @@ -49,7 +49,7 @@ Comment configurer cette application : via le panneau d'administration ainsi que ## Informations additionnelles -* Pour augmenter l'espace pour l'utilisateur dans le CryptPad, vous pouvez configurer le fichier `config.js` dans le dossier `/var/www/cryptpad/config.js`, puis redémarrez le service CryptPad `sudo service cryptpad restart`. +* Pour augmenter l'espace pour l'utilisateur dans le CryptPad, vous pouvez configurer le fichier `config.js` dans le dossier `/var/www/cryptpad/config/config.js`, puis redémarrez le service CryptPad `sudo service cryptpad restart`. ## Liens From 155626899f12a065ba6e5051adcfa90717f3e59d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 21 Jan 2021 22:16:32 +0100 Subject: [PATCH 4/8] Remove path from manifest --- manifest.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/manifest.json b/manifest.json index 8275860..73c1cab 100644 --- a/manifest.json +++ b/manifest.json @@ -31,16 +31,6 @@ "fr": "Choisissez un nom de domaine pour CryptPad" }, "example": "cryptpad.example.com" - }, - { - "name": "path", - "type": "path", - "ask": { - "en": "Choose a path for CryptPad, requires a dedicated sub-domain/domain.", - "fr": "Choisissez un chemin pour CryptPad, nécessite un sous-domaine/domaine dédié." - }, - "example": "/", - "default": "/" }, { "name": "admin", From 377c03e0529dc8d73687edc2ee83dd7d4c5b3f4c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 22 Jan 2021 14:21:54 +0100 Subject: [PATCH 5/8] Fix variable --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 5b6954b..fa3ca89 100644 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=path_url --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -admin_mail=$(ynh_user_get_info "$admin" 'mail') +admin_mail=$(ynh_user_get_info "$admin" "mail") #================================================= # STANDARD MODIFICATIONS diff --git a/scripts/upgrade b/scripts/upgrade index bad4cf5..3af5f5f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,7 +31,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path_url) final_path=$(ynh_app_setting_get --app=$app --key=final_path) is_public=$(ynh_app_setting_get --app=$app --key=is_public) admin=$(ynh_app_setting_get --app=$app --key=admin) -admin_mail=$(ynh_user_get_info '$admin' 'mail') +admin_mail=$(ynh_user_get_info "$admin" "mail") port=$(ynh_app_setting_get --app=$app --key=port) porti=$(ynh_app_setting_get --app=$app --key=porti) From a4ba228ab0f9a09801580da7b3411bdc5036829d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 22 Jan 2021 14:23:35 +0100 Subject: [PATCH 6/8] Update _common.sh --- scripts/_common.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 179e4f2..64d5b69 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -16,4 +16,18 @@ nodejs_version="12" #================================================= # FUTURE OFFICIAL HELPERS -#================================================= \ No newline at end of file +#================================================= + + +# Execute a command as another user +# usage: ynh_exec_as USER COMMAND [ARG ...] +ynh_exec_as() { + local USER=$1 + shift 1 + + if [[ $USER = $(whoami) ]]; then + eval "$@" + else + sudo -u "$USER" "$@" + fi +} \ No newline at end of file From 05b13179dac59d6465cc60af0e885a908078cbe2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 22 Jan 2021 18:18:49 +0100 Subject: [PATCH 7/8] Update _common.sh --- scripts/_common.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 64d5b69..a68592d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,16 +18,3 @@ nodejs_version="12" # FUTURE OFFICIAL HELPERS #================================================= - -# Execute a command as another user -# usage: ynh_exec_as USER COMMAND [ARG ...] -ynh_exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval "$@" - else - sudo -u "$USER" "$@" - fi -} \ No newline at end of file From d05bbdb00630d7c12abe57c4d433f15418a1335f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 23 Jan 2021 12:19:51 +0100 Subject: [PATCH 8/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 73c1cab..c6cdb5a 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": "3.24.0~ynh1", + "version": "3.24.0~ynh2", "url": "https://cryptpad.fr/", "license": "AGPL-3.0-only", "maintainer": {