Benjamin LabrecqueandClaude Opus 5
cfd3ecad6c
Deploy-time placeholders were spread across four independent
implementations: sed in the Gitea deploy script, ansible.builtin.replace
in two playbooks, a hardcoded suffix in bin/sls_hla_launch_gui.sh, and
another in agebd/pv.py. Each defined its own values, so nothing kept them
in sync and a missed substitution failed silently.
Step 1 -- one source of truth:
* config/environments.yml declares every deploy-time token, its value
per environment, and where tokens are allowed to live. An environment
that is missing a token, or defines an undeclared one, is a load-time
error.
* agebd.subs loads it and renders. Rendering is a strict regex over
declared token names rather than a template engine: the rendered
files are EPICS db/substitution files and Qt XML, and an unknown
token must raise rather than survive into the output.
* scripts/ci/check_subs.py enforces the contract in CI: tokens in a
rendered path are declared, declared tokens only appear where they
are rendered or generated, and no pre-migration delimiters survive.
Step 2 -- separate the two substitution stages by delimiter:
* Creation-time (copier, once per new service) keeps {{ token }}.
Deploy-time (every deploy, per environment) becomes @@token@@.
* This drops the {{ '{{ token }}' }} escaping from templates/, which
existed only because one Jinja pass had to emit syntax for a second.
* Angle brackets were tried first and rejected: << >> is not
well-formed XML, and cli parses qt/*.ui with ElementTree.
* The existing sed and ansible consumers are repointed at the new
delimiters so this stays behaviour-preserving. Routing them through
agebd.subs is step 3.
Also fixes, as a side effect of having one implementation:
* The sed pattern '{{ *agebd_env_suffix_upper* }}' quantified 'r'
rather than the space, so it only matched one exact spacing.
* agebd.subs.read_ioc_port compares service names case-insensitively;
ansible/tasks/utils/get-ioc-port.yml still compares CamelCase
registry names against a lowercase input and never matches.
qt/*.ui is declared as a render path but nothing renders it yet -- the
Qt deploy step is still a plain rsync. Wiring that up is step 4.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
18 lines
484 B
Desktop File
18 lines
484 B
Desktop File
[Unit]
|
|
Description=AGEBD-SERVICE-MASTER
|
|
After=network.target
|
|
|
|
[Service]
|
|
Environment=AGEBD_ENV=@@agebd_env@@
|
|
Environment=PYTHONUNBUFFERED=1
|
|
ExecStart=/sls/bd/hla/@@agebd_env@@/bin/start_service.sh MASTER
|
|
Restart=no
|
|
|
|
[Install]
|
|
WantedBy=default.target
|
|
|
|
# https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html
|
|
# systemctl --user daemon-reload
|
|
# systemctl --user enable /sls/bd/bin/systemd/AGEBD-SERVICE-MASTER.service
|
|
# systemctl --user start AGEBD-SERVICE-MASTER
|