From dc235a6026c4ff2626bc16996ca746abff9a8603 Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Fri, 8 Dec 2023 07:08:03 +0100 Subject: [PATCH 1/9] Update manifest.toml --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 921f646..b5a05ae 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,7 +37,6 @@ ram.runtime = "50M" arm64.sha256 = "1728d26f398b58156411f80b871a2d5a0825ae446a8bec70a01a952fe7c707cb" amd64.url = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.11.1-linux-x86_64.tar.gz" amd64.sha256 = "dd8572e4f50ffbe4079cce315b17c25e3cebaa02fd7eb134d2aa222703459780" - autoupdate.strategy = "latest_github_tag" [resources.system_user] From 8e8cc9040e607fa80214085d351073bdbad26d1b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 11 Mar 2024 16:04:15 +0100 Subject: [PATCH 2/9] [autopatch] TEST BEFORE MERGE ynh_setup_source --full_replace=1 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index b383445..c67746d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=20 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="config/elasticsearch.yml config/jvm.options.d/yunohost.conf" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config/elasticsearch.yml config/jvm.options.d/yunohost.conf" fi chmod -R o-rwx "$install_dir" From d24ff8dd2b7546b9401e6aaa4f5b81cebda465db Mon Sep 17 00:00:00 2001 From: Florent Date: Sat, 16 Mar 2024 08:57:21 +0100 Subject: [PATCH 3/9] Remove --keep option in upgrade (useless) --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c67746d..19e4232 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=20 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config/elasticsearch.yml config/jvm.options.d/yunohost.conf" + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 fi chmod -R o-rwx "$install_dir" From 01d330df085c7925faf791f057044a5c5861bc54 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 16 Mar 2024 07:57:45 +0000 Subject: [PATCH 4/9] Auto-update README --- README.md | 17 ++++++++--------- README_fr.md | 23 +++++++++++------------ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index ebd0e44..43568ef 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -19,21 +19,20 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Elasticsearch is the distributed, RESTful search and analytics engine at the heart of the [Elastic Stack](https://www.elastic.co/products). You can use Elasticsearch to store, search, and manage data for logs, metrics, search backend, application monitoring, Endpoint security. To learn more about Elasticsearch’s features and capabilities, see the [product page](https://www.elastic.co/products/elasticsearch). - **Shipped version:** 8.11.1~ynh2 -**Demo:** https://www.elastic.co/demos +**Demo:** ## :red_circle: Antifeatures - **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use. ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info @@ -41,7 +40,7 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug or sudo yunohost app upgrade elasticsearch8 -u https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index 6b3ab02..9de1099 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -18,21 +18,20 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Elasticsearch est le moteur de recherche et d'analyse distribué et RESTful au cœur de la [Elastic Stack](https://www.elastic.co/products). Vous pouvez utiliser Elasticsearch pour stocker, rechercher et gérer des données pour les journaux, les métriques, le backend de recherche, la surveillance des applications et la sécurité des points de terminaison. Pour en savoir plus sur les fonctionnalités et capacités d'Elasticsearch, consultez la [page produit](https://www.elastic.co/products/elasticsearch). - **Version incluse :** 8.11.1~ynh2 -**Démo :** https://www.elastic.co/demos -## :red_circle: Fonctions indésirables +**Démo :** +## :red_circle: Anti-fonctionnalités -- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use. +- **Application sous licence libre restreinte** : L'application packagée est sous une licence globalement libre, mais avec des clauses qui pourraient restreindre son utilisation. ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs @@ -40,10 +39,10 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug ou sudo yunohost app upgrade elasticsearch8 -u https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** From 755a8414902159cf6b19c05dd491718bc48cb887 Mon Sep 17 00:00:00 2001 From: Florent Date: Sat, 16 Mar 2024 08:58:57 +0100 Subject: [PATCH 5/9] Bump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 921f646..823b029 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "ElasticSearch 8" description.en = "Distributed and RESTful search engine" description.fr = "Moteur de recherche RESTful" -version = "8.11.1~ynh2" +version = "8.11.1~ynh3" maintainers = ["fflorent"] From 3a4ec4c5a93fd170575bf1f1f4f9bdc02a468699 Mon Sep 17 00:00:00 2001 From: Florent Date: Sat, 16 Mar 2024 09:13:17 +0100 Subject: [PATCH 6/9] Prevent warning --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 19e4232..ccc78e5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,9 @@ then ynh_script_progression --message="Upgrading source files..." --weight=20 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 + # The keep option prevents this warning: + # "File .... has been manually modified since the installation or last upgrade." + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config/elasticsearch.yml" fi chmod -R o-rwx "$install_dir" From e12a63276702e42058fdfe0152ca6c21ff9ea4c5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 16 Mar 2024 08:22:26 +0000 Subject: [PATCH 7/9] 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 43568ef..ffad024 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Elasticsearch is the distributed, RESTful search and analytics engine at the heart of the [Elastic Stack](https://www.elastic.co/products). You can use Elasticsearch to store, search, and manage data for logs, metrics, search backend, application monitoring, Endpoint security. To learn more about Elasticsearch’s features and capabilities, see the [product page](https://www.elastic.co/products/elasticsearch). -**Shipped version:** 8.11.1~ynh2 +**Shipped version:** 8.11.1~ynh3 **Demo:** ## :red_circle: Antifeatures diff --git a/README_fr.md b/README_fr.md index 9de1099..8d4c838 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 Elasticsearch est le moteur de recherche et d'analyse distribué et RESTful au cœur de la [Elastic Stack](https://www.elastic.co/products). Vous pouvez utiliser Elasticsearch pour stocker, rechercher et gérer des données pour les journaux, les métriques, le backend de recherche, la surveillance des applications et la sécurité des points de terminaison. Pour en savoir plus sur les fonctionnalités et capacités d'Elasticsearch, consultez la [page produit](https://www.elastic.co/products/elasticsearch). -**Version incluse :** 8.11.1~ynh2 +**Version incluse :** 8.11.1~ynh3 **Démo :** ## :red_circle: Anti-fonctionnalités From 8431c8d19ea7bf0b3a8201719d8a02dc14d84953 Mon Sep 17 00:00:00 2001 From: Florent Date: Sat, 16 Mar 2024 09:26:51 +0100 Subject: [PATCH 8/9] Upgrade autoupdate strategy --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index 71b4872..7c563d0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,6 +37,8 @@ ram.runtime = "50M" arm64.sha256 = "1728d26f398b58156411f80b871a2d5a0825ae446a8bec70a01a952fe7c707cb" amd64.url = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.11.1-linux-x86_64.tar.gz" amd64.sha256 = "dd8572e4f50ffbe4079cce315b17c25e3cebaa02fd7eb134d2aa222703459780" + autoupdate.upstream = "https://github.com/elastic/elasticsearch/" + autoupdate.strategy = "latest_github_release" [resources.system_user] From 769ded0f898d20eb223b14e496186ba93e8746db Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 17 Mar 2024 23:31:51 +0100 Subject: [PATCH 9/9] fix autoupdater Once the PR is open, the maintainer has to manually change the download URL --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 7c563d0..5f509a9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -35,11 +35,14 @@ ram.runtime = "50M" [resources.sources.main] arm64.url = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.11.1-linux-aarch64.tar.gz" arm64.sha256 = "1728d26f398b58156411f80b871a2d5a0825ae446a8bec70a01a952fe7c707cb" + autoupdate.asset.arm64 = ".*\\.tar\\.gz$" amd64.url = "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.11.1-linux-x86_64.tar.gz" amd64.sha256 = "dd8572e4f50ffbe4079cce315b17c25e3cebaa02fd7eb134d2aa222703459780" + autoupdate.asset.amd64 = ".*\\.tar\\.gz$" autoupdate.upstream = "https://github.com/elastic/elasticsearch/" autoupdate.strategy = "latest_github_release" + [resources.system_user] [resources.install_dir]