From d3fcd65dac2f9a4580fda0dfdb305e801f851a0e Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 8 Feb 2023 13:37:57 +0100 Subject: [PATCH 1/3] Handle pid directory through systemd --- conf/systemd.service | 1 + scripts/install | 9 --------- scripts/remove | 7 ------- scripts/restore | 9 --------- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index d579d7d..b2fc349 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,6 +7,7 @@ After=network.target Type=simple User=__APP__ Group=__APP__ +RuntimeDirectory=__APP__ Environment="ES_JAVA_HOME=__FINALPATH__/jdk" Environment="ES_PATH_CONF=__FINALPATH__/config" Environment="PID_DIR=/run/__APP__" diff --git a/scripts/install b/scripts/install index be490c4..1e9f7d5 100755 --- a/scripts/install +++ b/scripts/install @@ -87,15 +87,6 @@ chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# CREATE PID DIRECTORY -#================================================= - -mkdir -p "/run/$app" - -chmod 700 "/run/$app" -chown $app:$app "/run/$app" - #================================================= # ADD CONFIGURATIONS #================================================= diff --git a/scripts/remove b/scripts/remove index 18b9aeb..1f06e84 100755 --- a/scripts/remove +++ b/scripts/remove @@ -68,13 +68,6 @@ then ynh_secure_remove --file="$datadir" fi -#================================================= -# REMOVE PID DIR -#================================================= - -ynh_script_progression --message="Removing pid directory..." --weight=1 -ynh_secure_remove --file="/run/$app" - #================================================= # CLOSE A PORT #================================================= diff --git a/scripts/restore b/scripts/restore index 28e18d5..6183965 100755 --- a/scripts/restore +++ b/scripts/restore @@ -74,15 +74,6 @@ chmod 750 "$datadir" chmod -R o-rwx "$datadir" chown -R $app:www-data "$datadir" -#================================================= -# CREATE PID DIRECTORY -#================================================= - -mkdir -p "/run/$app" - -chmod 700 "/run/$app" -chown $app:$app "/run/$app" - #================================================= # SPECIFIC RESTORATION #================================================= From 77a35986bcc2751861594132d3e0e0721ff52015 Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 8 Feb 2023 13:38:11 +0100 Subject: [PATCH 2/3] Bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index de41371..3bdda51 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~ynh5", + "version": "7.17.8~ynh6", "url": "https://github.com/elastic/elasticsearch", "upstream": { "license": "SSPL-1.0", From 2459525c690fbd1dcdffa95472f49474558bd207 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Feb 2023 12:38:36 +0000 Subject: [PATCH 3/3] 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 5795d8a..b7320f0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # ElasticSearch 7 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) +[![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) *[Lire ce readme en français.](./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). -**Shipped version:** 7.17.8~ynh5 +**Shipped version:** 7.17.8~ynh6 **Demo:** https://www.elastic.co/demos ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index d75230a..f22ebba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ 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)* @@ -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~ynh5 +**Version incluse :** 7.17.8~ynh6 **Démo :** https://www.elastic.co/demos ## Avertissements / informations importantes