From 3bb67f679c4566549a0ba533f6e5e3518e4c3267 Mon Sep 17 00:00:00 2001 From: Laur Ivan Date: Tue, 20 Dec 2022 15:44:55 +0100 Subject: [PATCH] fix: Docker compose and configuration. --- README.md | 3 ++- templates/docker-compose.yml.j2 | 2 +- templates/env.knx-monitor.conf.j2 | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f5c8e9f..35f1a52 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ Role Variables knx_monitor: docker_version: "latest" gateway_ip: "localhost" - topology_file: "{{ \".\" | | expanduser | realpath }}/topology.csv" + config_path: "~/knx-monitor" + topology_source: "./topology.csv" influx: url: "http://localhost:8086" diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 2652083..2e30fc7 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -7,7 +7,7 @@ services: restart: unless-stopped volumes: - # - {{ knx_monitor.config_path | expanduser | realpath }}/export-addresses.csv:/code/knx/export-addresses.csv:ro + - {{ knx_monitor.config_path | expanduser | realpath }}/export-addresses.csv:/code/knx/export-addresses.csv:ro - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro env_file: diff --git a/templates/env.knx-monitor.conf.j2 b/templates/env.knx-monitor.conf.j2 index bb4a989..32c24ad 100644 --- a/templates/env.knx-monitor.conf.j2 +++ b/templates/env.knx-monitor.conf.j2 @@ -1,4 +1,5 @@ KNX_GATEWAY_IP={{ knx_monitor.gateway_ip }} +KNX_TOPOLOGY=/code/knx/export-addresses.csv INFLUX_BUCKET={{ knx_monitor.influx.bucket }} INFLUX_ORG={{ knx_monitor.influx.org }}