From 72da6c0a8d83a7cd658d6a045a025d73bf30b45f Mon Sep 17 00:00:00 2001 From: CroneKorkN Date: Sun, 10 May 2026 17:48:03 +0200 Subject: [PATCH] left4me: pin EnvironmentFile order via tuples (was sets) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sets in libs/systemd.py:18 are sorted alphabetically. The current output is correct by accident — host.env < web.env, host.env < /var. Adding a third path later would silently reorder. Tuples preserve insertion order; generate_unitfile() iterates them the same way. Environment (HOME=, PATH=) stays a set: each line is an independent KEY=VALUE assignment, order is irrelevant. --- bundles/left4me/metadata.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/left4me/metadata.py b/bundles/left4me/metadata.py index 7f96bfd..3c48c6c 100644 --- a/bundles/left4me/metadata.py +++ b/bundles/left4me/metadata.py @@ -44,10 +44,10 @@ def systemd_units(metadata): 'HOME=/var/lib/left4me', 'PATH=/opt/left4me/.venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', }, - 'EnvironmentFile': { + 'EnvironmentFile': ( '/etc/left4me/host.env', '/etc/left4me/web.env', - }, + ), 'ExecStart': ( '/opt/left4me/.venv/bin/gunicorn ' f'--workers {workers} --threads {threads} ' @@ -77,10 +77,10 @@ def systemd_units(metadata): 'Type': 'simple', 'User': 'left4me', 'Group': 'left4me', - 'EnvironmentFile': { + 'EnvironmentFile': ( '/etc/left4me/host.env', '/var/lib/left4me/instances/%i/instance.env', - }, + ), 'WorkingDirectory': '-/var/lib/left4me/runtime/%i/merged/left4dead2', 'ExecStartPre': ( '+/usr/bin/nsenter --mount=/proc/1/ns/mnt -- '