From 17bab311756a0ef6042d69fac045e10924324efe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Mar 2021 21:49:50 +0100 Subject: [PATCH 1/2] Fix --- README.md | 2 +- README_fr.md | 2 +- check_process | 1 - scripts/install | 1 - scripts/upgrade | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2feca79..0e2ab32 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ You can access Etherpad's admin panel at `domain.tld/admin`. The configuration f ## Documentation * Official documentation: http://etherpad.org/doc/v1.8.13 - * YunoHost documentation: https://yunohost.org/#/app_etherpad + * YunoHost documentation: https://yunohost.org/en/app_etherpad ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 366bcce..f583c69 100644 --- a/README_fr.md +++ b/README_fr.md @@ -33,7 +33,7 @@ Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain ## Documentation * Documentation officielle : http://etherpad.org/doc/v1.8.13 - * Documentation YunoHost : https://yunohost.org/#/app_etherpad + * Documentation YunoHost : https://yunohost.org/fr/app_etherpad ## Fonctionnalités spécifiques à YunoHost diff --git a/check_process b/check_process index 89a85f6..4c14d9c 100644 --- a/check_process +++ b/check_process @@ -23,7 +23,6 @@ upgrade=1 from_commit=96653aee9379d579a655777ac274355f4afca61c backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/scripts/install b/scripts/install index c88762f..04230bf 100644 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,6 @@ popd || ynh_die ynh_script_progression --message="Configuring Etherpad..." --weight=60 ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json" - ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ee6b278..11a1c37 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -127,7 +127,6 @@ ynh_install_nodejs --nodejs_version=$nodejs_version ynh_script_progression --message="Reconfiguring Etherpad..." --weight=6 ynh_add_config --template="../conf/settings.json" --destination="$final_path/settings.json" - ynh_add_config --template="../conf/credentials.json" --destination="$final_path/credentials.json" #================================================= From dc72b3875db54a12a057dc7904aa37ac510938cb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 19 May 2021 11:30:30 +0200 Subject: [PATCH 2/2] Update check_process --- check_process | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/check_process b/check_process index 4c14d9c..b1374b7 100644 --- a/check_process +++ b/check_process @@ -1,17 +1,15 @@ # See here for more information # https://github.com/YunoHost/package_check#syntax-check_process-file -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" language="fr" - is_public=1 (PUBLIC|public=1|private=0) + is_public=1 password="pass" - port="9001" (PORT) + port="9001" ; Checks pkg_linter=1 setup_sub_dir=1