Merge pull request #1 from TopdRob/main

service API to get the MQTT data Thanks for your help!
Condorello · Aug 31, 2023 · ed72838 · ed72838
2 parents 73cc908 + d32d4c1
commit ed72838
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/HASS_addon/config.yaml b/HASS_addon/config.yaml
@@ -25,4 +25,4 @@ schema:
   mqtt_broker_host: str
   mqtt_broker_port: int
   mqtt_username: str
-  mqtt_password: str
+  mqtt_password: password
diff --git a/HASS_addon/run.sh b/HASS_addon/run.sh
@@ -1,16 +1,16 @@
 #!/usr/bin/with-contenv bashio
 
-MQTT_BROKER_HOST=$(bashio::config 'mqtt_broker_host')
-export MQTT_BROKER_HOST
+export MQTT_BROKER_HOST=$(bashio::config 'mqtt_broker_host')
+export MQTT_BROKER_PORT=$(bashio::config 'mqtt_broker_port')
+export MQTT_USERNAME=$(bashio::config 'mqtt_username')
+export MQTT_PASSWORD=$(bashio::config 'mqtt_password')
 
-MQTT_BROKER_PORT=$(bashio::config 'mqtt_broker_port')
-export MQTT_BROKER_PORT
-
-MQTT_USERNAME=$(bashio::config 'mqtt_username')
-export MQTT_USERNAME
-
-MQTT_PASSWORD=$(bashio::config 'mqtt_password')
-export MQTT_PASSWORD
+if bashio::var.has_value "$(bashio::services 'mqtt')"; then
+    export MQTT_BROKER_HOST="$(bashio::services 'mqtt' 'host')"
+    export MQTT_BROKER_PORT="$(bashio::services 'mqtt' 'port')"
+    export MQTT_USERNAME="$(bashio::services 'mqtt' 'username')"
+    export MQTT_PASSWORD="$(bashio::services 'mqtt' 'password')"
+fi
 
 echo "running pws server"