Fix respondd site prefixes on gateways

freifunkMUC · Nov 30, 2023 · bff6ee1 · bff6ee1
1 parent 53a8cf4
commit bff6ee1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/respondd/alias.json b/respondd/alias.json
@@ -8,7 +8,7 @@
       "contact": "[email protected]"
     },
     "system": {
-      "domain_code": "ffmuc_{{ site }}",
+      "domain_code": "{{ prefix }}_{{ site }}",
       "role": "gateway"
     },
     "pages": [

diff --git a/respondd/init.sls b/respondd/init.sls
@@ -10,7 +10,9 @@
 python3-netifaces:
    pkg.installed
 
-{% for site in salt['pillar.get']('netbox:config_context:sites').values()|sum(start=[])  %}
+{% set sites = salt['pillar.get']('netbox:config_context:sites') %}
+{% for prefix, domains in sites.items() %}
+{% for site in domains %}
 
 {% if not salt['file.directory_exists']('/opt/respondd-' ~ site ) %}
 /opt/respondd-{{ site }}:
@@ -64,4 +66,4 @@ respondd@{{ site }}:
       - file: /opt/respondd-{{ site }}/config.json
       - file: /etc/systemd/system/[email protected]
 {% endfor %}
-
+{% endfor %}