From 04e6d681f04731c67b9b65fb6a55a21184fd4baa Mon Sep 17 00:00:00 2001 From: xengineering Date: Mon, 23 Mar 2026 17:25:50 +0100 Subject: Move default.json to configs/valid Since the default configuration is a valid configuration it should belong to this new directory. This allows to continue with extending automated tests to test all configurations in this directory. --- config.go | 2 +- configs/default.json | 11 ----------- configs/meson.build | 2 +- configs/valid/default.json | 11 +++++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 configs/default.json create mode 100644 configs/valid/default.json diff --git a/config.go b/config.go index d39efca..b3cd9dc 100644 --- a/config.go +++ b/config.go @@ -31,7 +31,7 @@ func init() { mqttTopicPrefixRegexp = regexp.MustCompile(MQTT_TOPIC_PREFIX_REGEX) } -//go:embed configs/default.json +//go:embed configs/valid/default.json var defaultConfig []byte type MQTTConfig struct { diff --git a/configs/default.json b/configs/default.json deleted file mode 100644 index b291185..0000000 --- a/configs/default.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "mqtt": { - "broker": "tcp://127.0.0.1:1883", - "client-id": "siaserver", - "topic-prefix": "sia" - }, - "homematic": { - "ccu": "http://127.0.0.1:8080", - "polling-period": "50ms" - } -} diff --git a/configs/meson.build b/configs/meson.build index 98110da..aa16a47 100644 --- a/configs/meson.build +++ b/configs/meson.build @@ -1,3 +1,3 @@ fs = import('fs') -default_config = fs.copyfile(meson.current_source_dir() / 'default.json') +default_config = fs.copyfile(meson.current_source_dir() / 'valid' / 'default.json') diff --git a/configs/valid/default.json b/configs/valid/default.json new file mode 100644 index 0000000..b291185 --- /dev/null +++ b/configs/valid/default.json @@ -0,0 +1,11 @@ +{ + "mqtt": { + "broker": "tcp://127.0.0.1:1883", + "client-id": "siaserver", + "topic-prefix": "sia" + }, + "homematic": { + "ccu": "http://127.0.0.1:8080", + "polling-period": "50ms" + } +} -- cgit v1.3