Finalyzing nut-driver to nut-driver@ups evolution for Debian >=12

Author: tdy91

nut/map.jinja

@@ -41,27 +41,24 @@
 {%- endif %}
 
 
-{# BEGIN of post-processing for Debian >=12 nut-driver@ups #}
+{# BEGIN: Post-processing for multi-UPS + Debian 10/12 nut-driver@ups #}
 {%- set os_ver = grains.get('osrelease', '0') | int %}
 {%- set ups_units = salt['pillar.get']('nut:server:ups:config:units', {}) %}
 {%- set ups_keys = ups_units.keys() | list %}
-{%- set first_ups = ups_keys[0] if ups_keys | length > 0 else 'unknown' %}
 
 {%- if os_ver < 12 %}
-nut:
-  server:
-    ups:
-      service:
-        name: nut-driver
-        enabled: true
-      instance: ''
+  {# Debian 10 : one service only nut-driver #}
+  {%- do nut.setdefault('server', {}).setdefault('ups', {}).update({
+        'services': [{'name': 'nut-driver', 'enabled': True}]
+      }) %}
 {%- else %}
-nut:
-  server:
-    ups:
-      service:
-        name: nut-driver@{{ first_ups }}
-        enabled: true
-      instance: {{ first_ups }}
+  {# Debian 12+ : un service par UPS #}
+  {%- set services = [] %}
+  {%- for ups in ups_keys %}
+    {%- do services.append({'name': 'nut-driver@' ~ ups, 'enabled': True}) %}
+  {%- endfor %}
+  {%- do nut.setdefault('server', {}).setdefault('ups', {}).update({
+        'services': services
+      }) %}
 {%- endif %}
-{# END of post-processing for Debian >=12 nut-driver@ups #}
+{# END: Post-processing for multi-UPS + Debian 10/12 nut-driver@ups #}

nut/server/service/running.sls

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
 
-{% import_yaml "nut/map.jinja" as nutmap %}
+{%- from "nut/map.jinja" import nut as nutmap with context %}
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
@@ -19,17 +19,19 @@ include:
   - {{ sls_server_config_upsd }}
   - {{ sls_server_config_users }}
 
-nut-server-service-running-ups-service-running:
+{%- for svc in nutmap.server.ups.services %}
+nut-server-service-running-ups-service-running-{{ loop.index }}:
   service.running:
-    - name: {{ nutmap.nut.server.ups.service.name }}
-    - enable: {{ nutmap.nut.server.ups.service.enabled }}
+    - name: {{ svc.name }}
+    - enable: {{ svc.enabled }}
     - watch:
       - sls: {{ sls_server_config_mode }}
       - sls: {{ sls_server_config_ups }}
       - sls: {{ sls_server_config_upsd }}
       - sls: {{ sls_server_config_users }}
     # If the mode is 'none' we respect the package and do nothing
-    - unless: test "{{ nut.mode }}" = "none"
+    - unless: test "{{ nutmap.mode }}" = "none"
+{%- endfor %}
 
 nut-server-service-running-upsd-service-running:
   service.running: