From b65a0b5cfea18ff9e153de06799a16c736f84851 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 13 Jan 2023 12:22:21 +0100 Subject: [PATCH 1/7] First commit (based on elasticsearch7_ynh) --- LICENSE | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/LICENSE b/LICENSE index ead5bbd..1466a35 100644 --- a/LICENSE +++ b/LICENSE @@ -643,11 +643,15 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License +<<<<<<< HEAD <<<<<<< HEAD along with this program. If not, see . ======= along with this program. If not, see . >>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) +======= + along with this program. If not, see . +>>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) Also add information on how to contact you by electronic and paper mail. @@ -663,8 +667,13 @@ specific requirements. if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see <<<<<<< HEAD +<<<<<<< HEAD . ======= . >>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) +======= +. + +>>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) From 2dfdd7e475a20f7672bdb1432ae879091823cf84 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 13 Jan 2023 12:49:11 +0100 Subject: [PATCH 2/7] Change package to fetch version 8 of ElasticSearch --- .github/workflows/updater.sh | 5 +++-- conf/jvm.options | 2 +- manifest.json | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 2a2b8ad..847022f 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -17,7 +17,7 @@ current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true) | .tag_name | select( startswith("v7") )' | sort -V | tail -1) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true) | .tag_name | select( startswith("v8") )' | sort -V | tail -1) # Later down the script, we assume the version has only digits and dots # Sometimes the release name starts with a "v", so let's filter it out. @@ -105,7 +105,8 @@ done #================================================= # Replace new version in manifest -echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json +admindoc="https://www.elastic.co/guide/en/elasticsearch/reference/$(echo $version | grep -Po "^\d+\.\d+")/elasticsearch-intro.html" +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\" | .upstream.admindoc = \"$admindoc\"" manifest.json)" > manifest.json # No need to update the README, yunohost-bot takes care of it diff --git a/conf/jvm.options b/conf/jvm.options index e805594..3cae266 100644 --- a/conf/jvm.options +++ b/conf/jvm.options @@ -11,7 +11,7 @@ ## -Xms4g ## -Xmx4g ## -## See https://www.elastic.co/guide/en/elasticsearch/reference/7.17/advanced-configuration.html +## See https://www.elastic.co/guide/en/elasticsearch/reference/8.6/advanced-configuration.html ## for more information ## ################################################################ diff --git a/manifest.json b/manifest.json index aed65b1..79a2daa 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name": "ElasticSearch 7", - "id": "elasticsearch7", + "name": "ElasticSearch 8", + "id": "elasticsearch8", "packaging_format": 1, "description": { "en": "Distributed and RESTful search engine.", From d0cdc6771f8a2fdb43ddb51f2656cfb57830c631 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 13 Jan 2023 12:50:45 +0100 Subject: [PATCH 3/7] Apply fixes from elasticsearch7_ynh --- README.md | 12 ++---------- README_fr.md | 12 ++---------- doc/DESCRIPTION.md | 10 +--------- manifest.json | 4 ++-- 4 files changed, 7 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index e131825..3fae63d 100644 --- a/README.md +++ b/README.md @@ -15,19 +15,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -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 - - A search backend - - Application monitoring - - Endpoint security - -... and more! - +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:** 7.17.8~ynh3 +**Shipped version:** 7.17.8~ynh4 **Demo:** https://www.elastic.co/demos ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index d220330..cda6b5b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,19 +15,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -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 - - A search backend - - Application monitoring - - Endpoint security - -... and more! - +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). -**Version incluse :** 7.17.8~ynh3 +**Version incluse :** 7.17.8~ynh4 **Démo :** https://www.elastic.co/demos ## Avertissements / informations importantes diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index f780789..e0a5b6e 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,10 +1,2 @@ -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 - - A search backend - - Application monitoring - - Endpoint security - -... and more! - +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). diff --git a/manifest.json b/manifest.json index 79a2daa..f767821 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Distributed and RESTful search engine.", "fr": "Moteur de recherche RESTful." }, - "version": "7.17.8~ynh3", + "version": "7.17.8~ynh4", "url": "https://github.com/elastic/elasticsearch", "upstream": { "license": "SSPL-1.0", @@ -15,7 +15,7 @@ "admindoc": "https://www.elastic.co/guide/en/elasticsearch/reference/7.17/elasticsearch-intro.html", "code": "https://github.com/elastic/elasticsearch" }, - "license": "AGPL-3.0-or-later", + "license": "SSPL-1.0", "maintainer": { "name": "fflorent", "email": "florent.git@zeteo.me" From 60c06ee397cd907defd3699194cb928d91d8d06b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 13 Jan 2023 11:59:48 +0000 Subject: [PATCH 4/7] Auto-update README --- README.md | 22 +++++++++------------- README_fr.md | 22 +++++++++------------- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 3fae63d..bc268d9 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# ElasticSearch 7 for YunoHost +# ElasticSearch 8 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/elasticsearch7.svg)](https://dash.yunohost.org/appci/app/elasticsearch7) ![Working status](https://ci-apps.yunohost.org/ci/badges/elasticsearch7.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/elasticsearch7.maintain.svg) -[![Install ElasticSearch 7 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elasticsearch7) +[![Integration level](https://dash.yunohost.org/integration/elasticsearch8.svg)](https://dash.yunohost.org/appci/app/elasticsearch8) ![Working status](https://ci-apps.yunohost.org/ci/badges/elasticsearch8.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/elasticsearch8.maintain.svg) +[![Install ElasticSearch 8 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elasticsearch8) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install ElasticSearch 7 quickly and simply on a YunoHost server. +> *This package allows you to install ElasticSearch 8 quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview @@ -30,28 +30,24 @@ To learn more about Elasticsearch’s features and capabilities, see the [produc - Therefore, the package is configured to remain not public for now (i.e. not accessible through the web, the apps depending on it should be installed on the same server) - Not scalable for now -## :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 documentation for this app: -* Report a bug: +* YunoHost documentation for this app: +* Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/elasticsearch7_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing). To try the testing branch, please proceed like that. ``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch7_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug or -sudo yunohost app upgrade elasticsearch7 -u https://github.com/YunoHost-Apps/elasticsearch7_ynh/tree/testing --debug +sudo yunohost app upgrade elasticsearch8 -u https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug ``` **More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index cda6b5b..078e6b2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# ElasticSearch 7 pour YunoHost +# ElasticSearch 8 pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/elasticsearch7.svg)](https://dash.yunohost.org/appci/app/elasticsearch7) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/elasticsearch7.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/elasticsearch7.maintain.svg) -[![Installer ElasticSearch 7 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elasticsearch7) +[![Niveau d'intégration](https://dash.yunohost.org/integration/elasticsearch8.svg)](https://dash.yunohost.org/appci/app/elasticsearch8) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/elasticsearch8.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/elasticsearch8.maintain.svg) +[![Installer ElasticSearch 8 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=elasticsearch8) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer ElasticSearch 7 rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer ElasticSearch 8 rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble @@ -30,28 +30,24 @@ To learn more about Elasticsearch’s features and capabilities, see the [produc - Therefore, the package is configured to remain not public for now (i.e. not accessible through the web, the apps depending on it should be installed on the same server) - Not scalable for now -## :red_circle: Fonctions indésirables - -- **Not totally free upstream**: The packaged app is under an overall free licence, but with clauses that restrict its use. - ## Documentations et ressources * Site officiel de l'app : * Documentation officielle de l'admin : * Dépôt de code officiel de l'app : -* Documentation YunoHost pour cette app : -* Signaler un bug : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/elasticsearch7_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch7_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug ou -sudo yunohost app upgrade elasticsearch7 -u https://github.com/YunoHost-Apps/elasticsearch7_ynh/tree/testing --debug +sudo yunohost app upgrade elasticsearch8 -u https://github.com/YunoHost-Apps/elasticsearch8_ynh/tree/testing --debug ``` **Plus d'infos sur le packaging d'applications :** From 48e1a55a2343d82c8ccd1720e5c9a09cfa2e1612 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 13 Jan 2023 13:03:32 +0100 Subject: [PATCH 5/7] Update manifest and sources --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- manifest.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 5789f94..eaf0a5f 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.17.8-linux-x86_64.tar.gz -SOURCE_SUM=1c40ba4e0912da1432cb85c0d246f68e14a7da249feea91752c8eaeb28adf0ac +SOURCE_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.6.0-linux-x86_64.tar.gz +SOURCE_SUM=afc24fe42bc60318dac6067831dcfe1495276a99dbf87ff52d09b4af722eb96c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 0f6a89d..5cb8842 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.17.8-linux-aarch64.tar.gz -SOURCE_SUM=47d6532a16e02b92208a0d71289a6fb021542c925ed868e49237032bc3ab5c6a +SOURCE_URL=https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.6.0-linux-aarch64.tar.gz +SOURCE_SUM=18d3ad5f7e97b23ddb783ba7c2a9f06bbc8a86a749a0b5278a73f6a887eaeab7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index f767821..00bf9cf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,13 +6,13 @@ "en": "Distributed and RESTful search engine.", "fr": "Moteur de recherche RESTful." }, - "version": "7.17.8~ynh4", + "version": "8.6.0~ynh1", "url": "https://github.com/elastic/elasticsearch", "upstream": { "license": "SSPL-1.0", "website": "https://elastic.co", "demo": "https://www.elastic.co/demos", - "admindoc": "https://www.elastic.co/guide/en/elasticsearch/reference/7.17/elasticsearch-intro.html", + "admindoc": "https://www.elastic.co/guide/en/elasticsearch/reference/8.6/elasticsearch-intro.html", "code": "https://github.com/elastic/elasticsearch" }, "license": "SSPL-1.0", From 0b845d65158d6a2b67c4f5f498874f38ae4b1b27 Mon Sep 17 00:00:00 2001 From: Florent Date: Fri, 13 Jan 2023 13:05:04 +0100 Subject: [PATCH 6/7] Fix LICENSE --- LICENSE | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/LICENSE b/LICENSE index 1466a35..9591157 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -643,15 +643,7 @@ the "copyright" line and a pointer to where the full notice is found. GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License -<<<<<<< HEAD -<<<<<<< HEAD - along with this program. If not, see . -======= along with this program. If not, see . ->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) -======= - along with this program. If not, see . ->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) Also add information on how to contact you by electronic and paper mail. @@ -666,14 +658,5 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<<<<<<< HEAD -<<<<<<< HEAD -. -======= . ->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) -======= -. - ->>>>>>> 6337cd6 (First commit (based on elasticsearch7_ynh)) From a43f0de0e811e35bd9d2c8add94940adab2e70e9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 13 Jan 2023 12:05:17 +0000 Subject: [PATCH 7/7] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bc268d9..ab11fc4 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Elasticsearch is the distributed, RESTful search and analytics engine at the hea To learn more about Elasticsearch’s features and capabilities, see the [product page](https://www.elastic.co/products/elasticsearch). -**Shipped version:** 7.17.8~ynh4 +**Shipped version:** 8.6.0~ynh1 **Demo:** https://www.elastic.co/demos ## Disclaimers / important information @@ -33,7 +33,7 @@ To learn more about Elasticsearch’s features and capabilities, see the [produc ## Documentation and resources * Official app website: -* Official admin documentation: +* Official admin documentation: * Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index 078e6b2..fbaf4e4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Elasticsearch is the distributed, RESTful search and analytics engine at the hea To learn more about Elasticsearch’s features and capabilities, see the [product page](https://www.elastic.co/products/elasticsearch). -**Version incluse :** 7.17.8~ynh4 +**Version incluse :** 8.6.0~ynh1 **Démo :** https://www.elastic.co/demos ## Avertissements / informations importantes @@ -33,7 +33,7 @@ To learn more about Elasticsearch’s features and capabilities, see the [produc ## Documentations et ressources * Site officiel de l'app : -* Documentation officielle de l'admin : +* Documentation officielle de l'admin : * Dépôt de code officiel de l'app : * Documentation YunoHost pour cette app : * Signaler un bug :