From a38eee9949c7873738694aa5b84a979680cfae9a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Mar 2021 22:11:15 +0100 Subject: [PATCH 1/9] Fix --- README.md | 2 +- README_fr.md | 2 +- check_process | 1 - 3 files changed, 2 insertions(+), 3 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= From fc0d56e690f44d0775b62ee2670fd6fc2ac714dd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 18:23:33 +0200 Subject: [PATCH 2/9] Fix badges --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0e2ab32..89e8870 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ You can access Etherpad's admin panel at `domain.tld/admin`. The configuration f #### Supported architectures -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad/) +* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad/) ## Limitations diff --git a/README_fr.md b/README_fr.md index f583c69..8e95378 100644 --- a/README_fr.md +++ b/README_fr.md @@ -44,8 +44,8 @@ Vous pouvez accéder au panneau d'administration d'Etherpad à l'adresse `domain #### Architectures supportées -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad/) +* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad/) ## Limitations From 4509bde31350a82b7cfd844c586b20d553f19c57 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Apr 2021 00:00:14 +0200 Subject: [PATCH 3/9] fix --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/upgrade | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index c532a0c..872cf2e 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 2eab5a8..7e4dd21 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib" -nodejs_version=14 +nodejs_version=15 #================================================= # PERSONAL HELPERS diff --git a/scripts/upgrade b/scripts/upgrade index ee6b278..adf6c51 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" #================================================= @@ -161,7 +160,7 @@ chmod 600 $final_path/credentials.json ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 # Create a dedicated systemd config -ynh_add_systemd_config --others_var="ynh_node_load_PATH" +ynh_add_systemd_config #================================================= # INTEGRATE SERVICE IN YUNOHOST From f7ed7462a28bb39cb21635a1e8f951c9a3740452 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Apr 2021 00:07:13 +0200 Subject: [PATCH 4/9] Update install --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c88762f..70c0007 100644 --- a/scripts/install +++ b/scripts/install @@ -118,6 +118,7 @@ chown -R $app: $final_path pushd $final_path || ynh_die ynh_use_nodejs + npm install -g npm@latest ynh_exec_as $app env $ynh_node_load_PATH src/bin/installDeps.sh popd || ynh_die @@ -147,7 +148,7 @@ chmod 600 $final_path/credentials.json ynh_script_progression --message="Configuring a systemd service..." --weight=4 # Create a dedicated systemd config -ynh_add_systemd_config --others_var="ynh_node_load_PATH" +ynh_add_systemd_config #================================================= # INTEGRATE SERVICE IN YUNOHOST From 7a3ff195093c159033698f1676e7a3cbc8a96ec7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 24 Apr 2021 00:12:33 +0200 Subject: [PATCH 5/9] Update install --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 70c0007..b579862 100644 --- a/scripts/install +++ b/scripts/install @@ -118,7 +118,6 @@ chown -R $app: $final_path pushd $final_path || ynh_die ynh_use_nodejs - npm install -g npm@latest ynh_exec_as $app env $ynh_node_load_PATH src/bin/installDeps.sh popd || ynh_die From 68017c2c36e493ed57bb4456a8e5b2899f71e39b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 3 May 2021 21:50:31 +0200 Subject: [PATCH 6/9] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 872cf2e..9aaf1b8 100644 --- a/manifest.json +++ b/manifest.json @@ -48,7 +48,7 @@ "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["de", "en", "es", "fr", "it", "pt"], + "choices": ["de", "en", "es", "fr", "it"], "default": "en" }, { From ef12895a0a83e10620dfe6c8374630d18f24ab18 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 3 May 2021 22:01:18 +0200 Subject: [PATCH 7/9] Fix --- README.md | 2 +- README_fr.md | 2 +- scripts/_common.sh | 13 ------------- scripts/install | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 89e8870..12f2b8c 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allow you to install Etherpad-Lite quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* > :warning: This package installs Etherpad-Lite (without MyPads and plugins). It uses PostgreSQL as database. >If you want to install Etherpad with the MyPads plugin, use the [Etherpad MyPads package](https://github.com/YunoHost-Apps/etherpad_mypads_ynh). diff --git a/README_fr.md b/README_fr.md index 8e95378..8f72fdc 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 Etherpad-Lite rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/install_fr) pour savoir comment l'installer et en profiter.* +Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/install_fr) pour savoir comment l'installer et en profiter.* > :warning: Ce paquet installe Etherpad-Lite (sans MyPads et divers plugins). Il utilise PostgreSQL comme base de données. > Si vous souhaitez installer Etherpad avec MyPads, utilisez le paquet [Etherpad MyPads](https://github.com/YunoHost-Apps/etherpad_mypads_ynh). diff --git a/scripts/_common.sh b/scripts/_common.sh index 7e4dd21..1554048 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -20,16 +20,3 @@ nodejs_version=15 #================================================= # 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 -} diff --git a/scripts/install b/scripts/install index b579862..67e0fa6 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" #================================================= From b32f5c356e3bc4bbfd79d804fa9efbf081d5c8c1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 11 May 2021 11:28:33 +0200 Subject: [PATCH 8/9] Add templates --- issue_template.md => .github/ISSUE_TEMPLATE.md | 4 ++-- .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++++++++ pull_request_template.md | 16 ---------------- 3 files changed, 18 insertions(+), 18 deletions(-) rename issue_template.md => .github/ISSUE_TEMPLATE.md (94%) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 pull_request_template.md diff --git a/issue_template.md b/.github/ISSUE_TEMPLATE.md similarity index 94% rename from issue_template.md rename to .github/ISSUE_TEMPLATE.md index 44b1d7b..2729a6b 100644 --- a/issue_template.md +++ b/.github/ISSUE_TEMPLATE.md @@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to Etherpad itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install etherpad + sudo yunohost app install the_app ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 6c28fc5..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how do you fix that problem* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From 6cd40de444b7703fa2cde8a880ee9cd05e036de9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 11 May 2021 11:29:30 +0200 Subject: [PATCH 9/9] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 9aaf1b8..99b42e9 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,7 @@ "name": "eric_G" }, "requirements": { - "yunohost": ">= 4.2.0" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [