From 1bf2e7f2b69ffc6ad6ffbb3f34c475e520bf28c0 Mon Sep 17 00:00:00 2001
From: ai-dev <ai-dev@fgitlab.my.to>
Date: Sun, 21 Sep 2025 22:41:33 +0200
Subject: [PATCH] testing

---
 .../rootfs/etc/cont-init.d/20-install-plugins        |  7 +++++++
 .../rootfs/etc/s6-overlay/s6-rc.d/opensearch/run     | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/opensearch-master/rootfs/etc/cont-init.d/20-install-plugins b/opensearch-master/rootfs/etc/cont-init.d/20-install-plugins
index ce0fe68..c3e8731 100644
--- a/opensearch-master/rootfs/etc/cont-init.d/20-install-plugins
+++ b/opensearch-master/rootfs/etc/cont-init.d/20-install-plugins
@@ -1,6 +1,13 @@
 #!/command/with-contenv bash
 set -euo pipefail
 OPTIONS_FILE=/data/options.json
+
+# Read options from Supervisor
+admin_password=$(bashio::config 'admin_password')
+
+# Export as environment variables for OpenSearch
+export OPENSEARCH_INITIAL_ADMIN_PASSWORD="${admin_password}"
+
 if [ ! -f "$OPTIONS_FILE" ]; then
   echo "[cont-init] No options.json, skipping plugin install"
   exit 0
diff --git a/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run b/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
index 385773c..a2ec7f4 100644
--- a/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
+++ b/opensearch-master/rootfs/etc/s6-overlay/s6-rc.d/opensearch/run
@@ -26,14 +26,14 @@ opensearch_heap=$(bashio::config 'opensearch_heap')
 export OPENSEARCH_INITIAL_ADMIN_PASSWORD="${admin_password}"
 export OPENSEARCH_JAVA_OPTS="-Xms${opensearch_heap} -Xmx${opensearch_heap}"
 
-echo "[s6-run] Starting OpenSearch node: $os-master roles:$master heap:$1.5g http:$9200 transport:$9300"
+echo "[s6-run] Starting OpenSearch node: $NODE_NAME roles:$NODE_ROLES heap:$HEAP http:$HTTP_PORT transport:$TRANSPORT_PORT"
 
 exec /usr/share/opensearch/bin/opensearch \
-  -E cluster.name=$hass-opensearch-cluster \
-  -E node.name=$os-master \
-  -E node.roles=[$master] \
-  -E http.port=$9200 \
-  -E transport.port=$9300 \
+  -E cluster.name=$CLUSTER_NAME \
+  -E node.name=$NODE_NAME \
+  -E node.roles=[$NODE_ROLES] \
+  -E http.port=$HTTP_PORT \
+  -E transport.port=$TRANSPORT_PORT \
   -E network.host=0.0.0.0 \
   -E discovery.seed_hosts=os-master,os-data-1,os-data-2,os-coord-1,os-coord-2 \
   -E cluster.initial_master_nodes=os-master