Skip to content

Support multiple UPS instances and per-UPS systemd services (Debian 12+) #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support multiple UPS instances and per-UPS systemd services (Debian 12+) #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34e2f5d
Prototype of nut-driver to nut-driver@ups evolution
tdy91 Jun 20, 2025
2c96066
Adding Debian >=12 test and suppress debug message
tdy91 Jun 20, 2025
1636df9
Finalyzing nut-driver to nut-driver@ups evolution for Debian >=12
tdy91 Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions nut/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,26 @@
{%- set macos_group = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
{%- do nut.update({'group': macos_group}) %}
{%- endif %}


{# 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 %}

{%- if os_ver < 12 %}
{# Debian 10 : one service only nut-driver #}
{%- do nut.setdefault('server', {}).setdefault('ups', {}).update({
'services': [{'name': 'nut-driver', 'enabled': True}]
}) %}
{%- else %}
{# 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: Post-processing for multi-UPS + Debian 10/12 nut-driver@ups #}
12 changes: 8 additions & 4 deletions nut/server/service/running.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
# vim: ft=sls

{%- from "nut/map.jinja" import nut as nutmap with context %}

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_file = tplroot ~ '.config.file' %}
Expand All @@ -17,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: {{ nut.server.ups.service.name }}
- enable: {{ 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:
Expand Down
Loading