Merge pull request #2 from YunoHost-Apps/testing

Testing

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:** 8.6.0~ynh1
+**Shipped version:** 8.6.0~ynh2
 
 **Demo:** https://www.elastic.co/demos
 ## Disclaimers / important information
@@ -30,6 +30,10 @@ 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: <https://elastic.co>

README_fr.md

@@ -5,21 +5,21 @@ It shall NOT be edited by hand.
 
 # ElasticSearch 8 pour YunoHost
 
-[![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)  
+[![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 8 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.*
+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 :** 8.6.0~ynh1
+**Version incluse :** 8.6.0~ynh2
 
 **Démo :** https://www.elastic.co/demos
 ## Avertissements / informations importantes
@@ -30,11 +30,15 @@ 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 : <https://elastic.co>
+* Site officiel de l’app : <https://elastic.co>
-* Documentation officielle de l'admin : <https://www.elastic.co/guide/en/elasticsearch/reference/8.6/elasticsearch-intro.html>
+* Documentation officielle de l’admin : <https://www.elastic.co/guide/en/elasticsearch/reference/8.6/elasticsearch-intro.html>
-* Dépôt de code officiel de l'app : <https://github.com/elastic/elasticsearch>
+* Dépôt de code officiel de l’app : <https://github.com/elastic/elasticsearch>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_elasticsearch8>
 * Signaler un bug : <https://github.com/YunoHost-Apps/elasticsearch8_ynh/issues>
 
@@ -50,4 +54,4 @@ 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 :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

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

manifest.json

@@ -6,7 +6,7 @@
         "en": "Distributed and RESTful search engine.",
         "fr": "Moteur de recherche RESTful."
     },
-    "version": "8.6.0~ynh1",
+    "version": "8.6.0~ynh2",
     "url": "https://github.com/elastic/elasticsearch",
     "upstream": {
         "license": "SSPL-1.0",

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

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

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

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