wn/home-automation
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use correct broker setting

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2025-11-08 15:56:03 +01:00
parent 6bf8ac3f99
commit 6271f46019
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/abstraction/README.md
View File

@@ -32,7 +32,7 @@ docker build -t abstraction:dev -f apps/abstraction/Dockerfile .
```bash ```bash
docker run --rm \ docker run --rm \
-v $(pwd)/config:/app/config:ro \ -v $(pwd)/config:/app/config:ro \
-e MQTT_BROKER=172.16.2.16 \ -e MQTT_BROKER=172.23.1.102 \
-e MQTT_PORT=1883 \ -e MQTT_PORT=1883 \
-e REDIS_HOST=172.23.1.116 \ -e REDIS_HOST=172.23.1.116 \
-e REDIS_PORT=6379 \ -e REDIS_PORT=6379 \

8
apps/abstraction/main.py
View File

@@ -38,8 +38,8 @@ def load_config(config_path: Path) -> dict[str, Any]:
logger.warning(f"Config file not found: {config_path}, using defaults") logger.warning(f"Config file not found: {config_path}, using defaults")
return { return {
"mqtt": { "mqtt": {
"broker": "172.16.2.16", "broker": os.getenv("MQTT_BROKER", "localhost"),
"port": 1883, "port": int(os.getenv("MQTT_PORT", "1883")),
"client_id": "home-automation-abstraction", "client_id": "home-automation-abstraction",
"keepalive": 60 "keepalive": 60
}, },
@@ -227,8 +227,8 @@ async def mqtt_worker(config: dict[str, Any], redis_client: aioredis.Redis) -> N
redis_client: Redis client for UI updates redis_client: Redis client for UI updates
""" """
mqtt_config = config.get("mqtt", {}) mqtt_config = config.get("mqtt", {})
broker = mqtt_config.get("broker", "172.16.2.16") broker = os.getenv("MQTT_BROKER") or mqtt_config.get("broker", "localhost")
port = mqtt_config.get("port", 1883) port = int(os.getenv("MQTT_PORT", mqtt_config.get("port", 1883)))
client_id = mqtt_config.get("client_id", "home-automation-abstraction") client_id = mqtt_config.get("client_id", "home-automation-abstraction")
# Append a short suffix (ENV override possible) so multiple processes don't collide # Append a short suffix (ENV override possible) so multiple processes don't collide
client_suffix = os.environ.get("MQTT_CLIENT_ID_SUFFIX") or uuid.uuid4().hex[:6] client_suffix = os.environ.get("MQTT_CLIENT_ID_SUFFIX") or uuid.uuid4().hex[:6]

2
apps/api/README.md
View File

@@ -42,7 +42,7 @@ docker build -t api:dev -f apps/api/Dockerfile .
```bash ```bash
docker run --rm -p 8001:8001 \ docker run --rm -p 8001:8001 \
-v $(pwd)/config:/app/config:ro \ -v $(pwd)/config:/app/config:ro \
-e MQTT_BROKER=172.16.2.16 \ -e MQTT_BROKER=172.23.1.102 \
-e MQTT_PORT=1883 \ -e MQTT_PORT=1883 \
-e REDIS_HOST=172.23.1.116 \ -e REDIS_HOST=172.23.1.116 \
-e REDIS_PORT=6379 \ -e REDIS_PORT=6379 \

6
apps/simulator/README.md
View File

@@ -53,7 +53,7 @@ docker build -t simulator:dev -f apps/simulator/Dockerfile .
```bash ```bash
docker run --rm -p 8010:8010 \ docker run --rm -p 8010:8010 \
-e MQTT_BROKER=172.16.2.16 \ -e MQTT_BROKER=172.23.1.102 \
-e MQTT_PORT=1883 \ -e MQTT_PORT=1883 \
-e SIM_PORT=8010 \ -e SIM_PORT=8010 \
simulator:dev simulator:dev
@@ -61,11 +61,9 @@ docker run --rm -p 8010:8010 \
**Mit Docker Network (optional):** **Mit Docker Network (optional):**
```bash ```bash
docker network create home-automation
docker run --rm -p 8010:8010 \ docker run --rm -p 8010:8010 \
--network home-automation \
--name simulator \ --name simulator \
-e MQTT_BROKER=172.16.2.16 \ -e MQTT_BROKER=172.23.1.102 \
simulator:dev simulator:dev
``` ```

4
apps/ui/README.md
View File

@@ -40,11 +40,9 @@ docker build -t ui:dev -f apps/ui/Dockerfile .
**Linux Server (empfohlen):** **Linux Server (empfohlen):**
```bash ```bash
# Mit Docker Network für Container-to-Container Kommunikation # Mit Docker Network für Container-to-Container Kommunikation
docker network create home-automation
docker run --rm -p 8002:8002 \ docker run --rm -p 8002:8002 \
--network home-automation \
-e UI_PORT=8002 \ -e UI_PORT=8002 \
-e API_BASE=http://api:8001 \ -e API_BASE=http://172.19.1.11:8001 \
-e BASE_PATH=/ \ -e BASE_PATH=/ \
ui:dev ui:dev
``` ```