diff --git a/README.md b/README.md index 3fae63d..5795d8a 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:** 7.17.8~ynh5 **Demo:** https://www.elastic.co/demos ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index cda6b5b..d75230a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,21 +5,21 @@ It shall NOT be edited by hand. # ElasticSearch 7 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) +[![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) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer ElasticSearch 7 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.* +> *Ce package vous permet d’installer ElasticSearch 7 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 +## 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, 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~ynh4 +**Version incluse :** 7.17.8~ynh5 **Démo :** https://www.elastic.co/demos ## Avertissements / informations importantes @@ -36,9 +36,9 @@ 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 : -* Dépôt de code officiel de l'app : +* 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 : @@ -54,4 +54,4 @@ ou sudo yunohost app upgrade elasticsearch7 -u https://github.com/YunoHost-Apps/elasticsearch7_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file diff --git a/conf/systemd.service b/conf/systemd.service index 67f4497..d579d7d 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,7 +11,6 @@ Environment="ES_JAVA_HOME=__FINALPATH__/jdk" Environment="ES_PATH_CONF=__FINALPATH__/config" Environment="PID_DIR=/run/__APP__" Environment="ES_SD_NOTIFY=true" -EnvironmentFile=-@path.env@ WorkingDirectory=__FINALPATH__/ ExecStart=__FINALPATH__/bin/elasticsearch -p ${PID_DIR}/__APP__.pid --quiet StandardOutput=append:/var/log/__APP__/__APP__.log diff --git a/manifest.json b/manifest.json index a5a5d69..de41371 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "elasticsearch7", "packaging_format": 1, "description": { - "en": "Distributed and RESTful search engine.", - "fr": "Moteur de recherche RESTful." + "en": "Distributed and RESTful search engine", + "fr": "Moteur de recherche RESTful" }, - "version": "7.17.8~ynh4", + "version": "7.17.8~ynh5", "url": "https://github.com/elastic/elasticsearch", "upstream": { "license": "SSPL-1.0", diff --git a/scripts/install b/scripts/install index dfb0fca..be490c4 100755 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." # Increase the maximum number of files inotify can monitor. cp -a ../conf/90-max_map_count-elasticsearch.conf /etc/sysctl.d/ # Then, reload the kernel configuration. -if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. +if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-elasticsearch.conf fi diff --git a/scripts/remove b/scripts/remove index d38411c..18b9aeb 100755 --- a/scripts/remove +++ b/scripts/remove @@ -105,7 +105,7 @@ ynh_script_progression --message="Removing various files..." if [ -e "/etc/sysctl.d/90-max_map_count-elasticsearch.conf" ]; then ynh_secure_remove --file="/etc/sysctl.d/90-max_map_count-elasticsearch.conf" # Reload the kernel configuration. - if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. + if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl --system fi diff --git a/scripts/restore b/scripts/restore index e9359ab..28e18d5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -91,7 +91,7 @@ chown $app:$app "/run/$app" ynh_script_progression --message="Restoring various files..." ynh_restore_file --origin_path="/etc/sysctl.d/90-max_map_count-elasticsearch.conf" -if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. +if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-elasticsearch.conf fi diff --git a/scripts/upgrade b/scripts/upgrade index 5c8e10f..0e6c27e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -99,7 +99,7 @@ ynh_script_progression --message="Increasing maximum map count (sysctl)..." # Increase the maximum number of files inotify can monitor. cp -a ../conf/90-max_map_count-elasticsearch.conf /etc/sysctl.d/ # Then, reload the kernel configuration. -if ! [ "$container" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. +if ! [ "${container:-}" = "lxc" ] # lxc doesn't allow sysctl to play with kernel options. then sysctl -p /etc/sysctl.d/90-max_map_count-elasticsearch.conf fi