From 4c384cb56ee7bb66af46fb97760e0b83b5286b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joanne=20Hug=C3=A9?= <joanne.huge@nexedi.com> Date: Wed, 17 May 2023 15:38:44 +0200 Subject: [PATCH] ors-amarisoft: fix dnsmasq configuration --- software/ors-amarisoft/buildout.hash.cfg | 2 +- software/ors-amarisoft/changelog.rst | 2 +- software/ors-amarisoft/config/dnsmasq.jinja2.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/software/ors-amarisoft/buildout.hash.cfg b/software/ors-amarisoft/buildout.hash.cfg index 76f66c7e6..4e3c3aa96 100644 --- a/software/ors-amarisoft/buildout.hash.cfg +++ b/software/ors-amarisoft/buildout.hash.cfg @@ -84,7 +84,7 @@ md5sum = 48b577daa5b53c2cf7fe2d30ea9c0235 [dnsmasq.jinja2.cfg] filename = config/dnsmasq.jinja2.cfg -md5sum = 05a983d97898813d5953fef4d03333a1 +md5sum = 1eb5703c1c60bddea65f3a49f2391173 [ims.jinja2.cfg] filename = config/ims.jinja2.cfg diff --git a/software/ors-amarisoft/changelog.rst b/software/ors-amarisoft/changelog.rst index 95782330a..04242e8e0 100644 --- a/software/ors-amarisoft/changelog.rst +++ b/software/ors-amarisoft/changelog.rst @@ -1,7 +1,7 @@ Changelog ========= -Version 1.0.322 (2023-05-17) +Version 1.0.323 (2023-05-17) ------------- * Add support for first version of MCPTT (Mission Critical Push To Talk) diff --git a/software/ors-amarisoft/config/dnsmasq.jinja2.cfg b/software/ors-amarisoft/config/dnsmasq.jinja2.cfg index e45ea15f9..93789dd8f 100644 --- a/software/ors-amarisoft/config/dnsmasq.jinja2.cfg +++ b/software/ors-amarisoft/config/dnsmasq.jinja2.cfg @@ -14,5 +14,5 @@ port=5353 {%- endfor %} {% for i, slave in enumerate(filtered_slave_instance_list) -%} -address=/{{ slave['subdomain'] }}.{{ slap_configuration.get('local_domain', '') }}/{{ slave.get('ip', '') }} +address=/{{ slave['subdomain'] }}.{{ slap_configuration['configuration'].get('local_domain', '') }}/{{ slave.get('ip', '') }} {% endfor -%} -- 2.30.9