From bff5fc810351e824fb2dc8f98a3093cdf3332a5d 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 16:21:21 +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           | 24 -------------------
 elastic-elasticsearch/8.14.3/data.yml         | 10 +++++++-
 .../8.14.3/docker-compose.yml                 |  3 ++-
 3 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 elastic-elasticsearch/8.14.3/config/elasticsearch.yml

diff --git a/elastic-elasticsearch/8.14.3/config/elasticsearch.yml b/elastic-elasticsearch/8.14.3/config/elasticsearch.yml
deleted file mode 100644
index 43eb666e1..000000000
--- a/elastic-elasticsearch/8.14.3/config/elasticsearch.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-discovery:
-  type: single-node
-
-network:
-  host: 0.0.0.0
-
-http:
-  host: 0.0.0.0
-  port: 9200
-  cors:
-    enabled: true
-    allow-origin: "*"
-
-path:
-  repo:
-    - /usr/share/elasticsearch/backup
-
-xpack:
-  security:
-    enabled: true
-    autoconfiguration:
-      enabled: true
-    enrollment:
-      enabled: true
diff --git a/elastic-elasticsearch/8.14.3/data.yml b/elastic-elasticsearch/8.14.3/data.yml
index 126733cc4..a5b9531ae 100644
--- a/elastic-elasticsearch/8.14.3/data.yml
+++ b/elastic-elasticsearch/8.14.3/data.yml
@@ -9,12 +9,20 @@ additionalProperties:
       type: text
     - default: 9200
       edit: true
-      envKey: PANEL_APP_PORT_HTTP
+      envKey: PANEL_APP_PORT_HTTPS
       labelZh: WebUI 端口
       labelEn: WebUI port
       required: true
       rule: paramPort
       type: number
+    - default: 9300
+      edit: true
+      envKey: PANEL_APP_PORT_CLUSTER
+      labelZh: 集群端口
+      labelEn: Cluster port
+      required: true
+      rule: paramPort
+      type: number
     - default: ""
       edit: true
       envKey: ELASTIC_PASSWORD
diff --git a/elastic-elasticsearch/8.14.3/docker-compose.yml b/elastic-elasticsearch/8.14.3/docker-compose.yml
index 88690a824..4d2ff6e4e 100644
--- a/elastic-elasticsearch/8.14.3/docker-compose.yml
+++ b/elastic-elasticsearch/8.14.3/docker-compose.yml
@@ -22,7 +22,8 @@ services:
         soft: 65536
         hard: 65536
     ports:
-      - ${PANEL_APP_PORT_HTTP}:9200
+      - ${PANEL_APP_PORT_HTTPS}:9200
+      - ${PANEL_APP_PORT_CLUSTER}:9300
     env_file:
       - /etc/1panel/envs/global.env
       - ${ENV_FILE:-/etc/1panel/envs/default.env}