From d1737af91b75fa8b05b24b93ef9df88390f20c09 Mon Sep 17 00:00:00 2001
From: Tobias Glatthar <t0bst4r@outlook.com>
Date: Sat, 30 Nov 2024 17:49:32 +0100
Subject: [PATCH] Revert "Revert "fix: activate ingress""

This reverts commit 0488f02819c1e25ea9b909a7b4e3818b138a9860.
---
 hamh/config.yaml               | 5 ++---
 hamh/docker-entrypoint.sh      | 5 +++--
 hamh_test/docker-entrypoint.sh | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/hamh/config.yaml b/hamh/config.yaml
index 014beb2..58ca94a 100644
--- a/hamh/config.yaml
+++ b/hamh/config.yaml
@@ -11,16 +11,15 @@ arch:
   - aarch64
   - amd64
   - armv7
-webui: http://[HOST]:[PORT:8482]/
+ingress: true
+ingress_port: 0
 map:
   - addon_config:rw
 options:
   app_log_level: info
   disable_log_colors: false
-  web_port: 8482
   mdns_network_interface: ""
 schema:
   app_log_level: list(silly|debug|info|warn|error)
   disable_log_colors: bool
-  web_port: int(1,)
   mdns_network_interface: "str?"
diff --git a/hamh/docker-entrypoint.sh b/hamh/docker-entrypoint.sh
index bcc0d5d..0e39ac0 100644
--- a/hamh/docker-entrypoint.sh
+++ b/hamh/docker-entrypoint.sh
@@ -4,6 +4,7 @@ home-assistant-matter-hub start \
   --log-level=$(bashio::config 'app_log_level') \
   --disable-log-colors=$(bashio::config 'disable_log_colors') \
   --storage-location=/config/data \
-  --web-port=$(bashio::config 'web_port') \
+  --web-port=$(bashio::addon.ingress_port) \
   --home-assistant-url='http://supervisor/core' \
-  --home-assistant-access-token="$SUPERVISOR_TOKEN"
+  --home-assistant-access-token="$SUPERVISOR_TOKEN" \
+  --http-ip-whitelist="172.30.32.2"
diff --git a/hamh_test/docker-entrypoint.sh b/hamh_test/docker-entrypoint.sh
index 8184b68..0e39ac0 100644
--- a/hamh_test/docker-entrypoint.sh
+++ b/hamh_test/docker-entrypoint.sh
@@ -1,10 +1,5 @@
 #!/usr/bin/with-contenv bashio
 
-bashio::addon.config
-echo ""
-bashio::addon.ingress_port
-echo ""
-
 home-assistant-matter-hub start \
   --log-level=$(bashio::config 'app_log_level') \
   --disable-log-colors=$(bashio::config 'disable_log_colors') \