From 0d060b8d942b983e1048748429c0b39ebe97f59a Mon Sep 17 00:00:00 2001
From: Tobias Glatthar <t0bst4r@outlook.com>
Date: Sat, 30 Nov 2024 17:28:55 +0100
Subject: [PATCH] Revert "feat: configure ingress support"

This reverts commit 8785b681010e89298a5c96a3c7952b477fa9298c.
---
 hamh/config.yaml               | 5 +++--
 hamh/docker-entrypoint.sh      | 5 ++---
 hamh/translations/en.yaml      | 4 ++++
 hamh_test/build.yaml           | 2 +-
 hamh_test/config.yaml          | 2 +-
 hamh_test/docker-entrypoint.sh | 5 +++++
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/hamh/config.yaml b/hamh/config.yaml
index 58ca94a..014beb2 100644
--- a/hamh/config.yaml
+++ b/hamh/config.yaml
@@ -11,15 +11,16 @@ arch:
   - aarch64
   - amd64
   - armv7
-ingress: true
-ingress_port: 0
+webui: http://[HOST]:[PORT:8482]/
 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 0e39ac0..bcc0d5d 100644
--- a/hamh/docker-entrypoint.sh
+++ b/hamh/docker-entrypoint.sh
@@ -4,7 +4,6 @@ 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::addon.ingress_port) \
+  --web-port=$(bashio::config 'web_port') \
   --home-assistant-url='http://supervisor/core' \
-  --home-assistant-access-token="$SUPERVISOR_TOKEN" \
-  --http-ip-whitelist="172.30.32.2"
+  --home-assistant-access-token="$SUPERVISOR_TOKEN"
diff --git a/hamh/translations/en.yaml b/hamh/translations/en.yaml
index 68728b6..35bb45c 100644
--- a/hamh/translations/en.yaml
+++ b/hamh/translations/en.yaml
@@ -8,6 +8,10 @@ configuration:
     name: Disable log colors
     description: |
       Print the log as plain text without any colors.
+  web_port:
+    name: Web UI Port
+    description: |
+      The port to use for the Web-UI. Default: 8482
   mdns_network_interface:
     name: mDNS Network Interface
     description: |
diff --git a/hamh_test/build.yaml b/hamh_test/build.yaml
index ac1d92d..8ed8f9e 100644
--- a/hamh_test/build.yaml
+++ b/hamh_test/build.yaml
@@ -1,2 +1,2 @@
 args:
-  package_version: "3.0.0-alpha.47"
+  package_version: "3.0.0-alpha.46"
diff --git a/hamh_test/config.yaml b/hamh_test/config.yaml
index fe2db8a..26f27d5 100644
--- a/hamh_test/config.yaml
+++ b/hamh_test/config.yaml
@@ -1,4 +1,4 @@
-version: "3.0.0-alpha.47"
+version: "3.0.0-alpha.46"
 slug: hamh_test
 name: Home-Assistant-Matter-Hub (Test Addon // DO NOT USE)
 description: THIS IS FOR TESTING PURPOSE. DO NOT USE THIS ADDON.
diff --git a/hamh_test/docker-entrypoint.sh b/hamh_test/docker-entrypoint.sh
index 0e39ac0..8184b68 100644
--- a/hamh_test/docker-entrypoint.sh
+++ b/hamh_test/docker-entrypoint.sh
@@ -1,5 +1,10 @@
 #!/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') \