From 91ed4a32b6978e6cbb4bef54e244d5cff0138134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= <qyg2297248353@163.com>
Date: Tue, 23 Jul 2024 12:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=20elastic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 萌森 <qyg2297248353@163.com>
---
 .../8.14.3/config/elasticsearch.yml                      | 3 ---
 apps/elastic-elasticsearch/8.14.3/data.yml               | 2 +-
 apps/elastic-elasticsearch/8.14.3/docker-compose.yml     | 9 +++++----
 apps/elastic-elasticsearch/8.14.3/scripts/init.sh        | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/elastic-elasticsearch/8.14.3/config/elasticsearch.yml b/apps/elastic-elasticsearch/8.14.3/config/elasticsearch.yml
index 9a7743005..f096963b9 100644
--- a/apps/elastic-elasticsearch/8.14.3/config/elasticsearch.yml
+++ b/apps/elastic-elasticsearch/8.14.3/config/elasticsearch.yml
@@ -4,6 +4,3 @@ http.host: 0.0.0.0
 http.cors.enabled: true
 http.cors.allow-origin: "*"
 network.host: 0.0.0.0
-
-xpack.security.enabled: true
-xpack.security.enrollment.enabled: true
diff --git a/apps/elastic-elasticsearch/8.14.3/data.yml b/apps/elastic-elasticsearch/8.14.3/data.yml
index 51e4559e8..94951a5c3 100644
--- a/apps/elastic-elasticsearch/8.14.3/data.yml
+++ b/apps/elastic-elasticsearch/8.14.3/data.yml
@@ -2,7 +2,7 @@ additionalProperties:
   formFields:
     - default: "/home/elasticsearch"
       edit: true
-      envKey: BARK_ROOT_PATH
+      envKey: ELASTICSEARCH_ROOT_PATH
       labelZh: 数据持久化路径
       labelEn: Data persistence path
       required: true
diff --git a/apps/elastic-elasticsearch/8.14.3/docker-compose.yml b/apps/elastic-elasticsearch/8.14.3/docker-compose.yml
index 69ef9c2dc..c5a7f0e98 100644
--- a/apps/elastic-elasticsearch/8.14.3/docker-compose.yml
+++ b/apps/elastic-elasticsearch/8.14.3/docker-compose.yml
@@ -29,11 +29,12 @@ services:
       - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ./config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-      - ${BARK_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs
-      - ${BARK_ROOT_PATH}/data:/usr/share/elasticsearch/data
-      - ${BARK_ROOT_PATH}/logs:/usr/share/elasticsearch/logs
-      - ${BARK_ROOT_PATH}/plugins:/usr/share/elasticsearch/plugins
+      - ${ELASTICSEARCH_ROOT_PATH}/certs:/usr/share/elasticsearch/config/certs
+      - ${ELASTICSEARCH_ROOT_PATH}/data:/usr/share/elasticsearch/data
+      - ${ELASTICSEARCH_ROOT_PATH}/logs:/usr/share/elasticsearch/logs
+      - ${ELASTICSEARCH_ROOT_PATH}/plugins:/usr/share/elasticsearch/plugins
     environment:
       - LICENSE=basic
       - ES_SETTING_BOOTSTRAP_MEMORY__LOCK=true
       - TAKE_FILE_OWNERSHIP=true
+      - CLUSTER_INITIAL__MASTER__NODES=${ES_SETTING_NODE_NAME}
diff --git a/apps/elastic-elasticsearch/8.14.3/scripts/init.sh b/apps/elastic-elasticsearch/8.14.3/scripts/init.sh
index d2270fe6d..835593aab 100644
--- a/apps/elastic-elasticsearch/8.14.3/scripts/init.sh
+++ b/apps/elastic-elasticsearch/8.14.3/scripts/init.sh
@@ -8,7 +8,7 @@ if [ -f .env ]; then
   sed -i '/^ENV_FILE=/d' .env
   echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
 
-  chown -R 1000:0 $BARK_ROOT_PATH
+  chown -R 1000:0 $ELASTICSEARCH_ROOT_PATH
 
   echo "Check Finish."