anti
1753eca198
Distros reserve /opt for different things (some package managers own it
outright), and a DECNET install that wants to live at /srv/decnet or
/usr/local/decnet had to hand-edit 13 service files post-install.
Converts every deploy/decnet-*.service to a .j2 template keyed on
{{ install_dir }}, rendered by `decnet init` at install time. All other
paths (log_dir, state_dir, runtime_dir, user, group) stay standard —
only install_dir varies.
Changes:
- deploy/decnet-*.service → deploy/decnet-*.service.j2 (13 files).
- decnet init gains --install-dir (default /opt/decnet, preserves
existing behaviour byte-for-byte). Validates absolute-path at the
CLI boundary. Threads through useradd --home-dir and the dir-creation
list so the filesystem layout matches the rendered templates.
- _install_units renders via Jinja2 with StrictUndefined (typo → loud
error, not a silent broken unit). SHA over rendered output so
operators with a custom install_dir get idempotent re-runs.
- decnet.target, tmpfiles.d, polkit rule stay static — they don't
reference install paths.
- 4 new tests: custom install_dir renders into units, default remains
/opt/decnet, relative paths rejected, second run with same custom
dir is idempotent.
50 lines
1.6 KiB
Django/Jinja
50 lines
1.6 KiB
Django/Jinja
[Unit]
|
|
Description=DECNET Self-Updater (mTLS)
|
|
Documentation=https://git.resacachile.cl/anti/DECNET/wiki/Remote-Updates
|
|
After=network-online.target
|
|
Wants=network-online.target
|
|
# Deliberately NOT After=decnet-agent.service — the updater must come up even
|
|
# when the agent is broken, since that is exactly when it is most useful.
|
|
|
|
[Service]
|
|
Type=simple
|
|
User=decnet
|
|
Group=decnet
|
|
WorkingDirectory={{ install_dir }}
|
|
EnvironmentFile=-{{ install_dir }}/.env.local
|
|
ExecStart={{ install_dir }}/venv/bin/decnet updater \
|
|
--host 0.0.0.0 --port 8766 \
|
|
--updater-dir /etc/decnet/updater \
|
|
--install-dir {{ install_dir }} \
|
|
--agent-dir /etc/decnet/agent
|
|
|
|
# The updater SIGTERMs the agent and spawns a new one. Same User=decnet means
|
|
# signalling is allowed without CAP_KILL. It does not need NET_ADMIN/NET_RAW
|
|
# itself — the new agent process picks those up from decnet-agent.service when
|
|
# systemd restarts it (or from the agent's own unit's AmbientCapabilities when
|
|
# spawned by the updater as a direct child).
|
|
CapabilityBoundingSet=
|
|
AmbientCapabilities=
|
|
|
|
# Security Hardening
|
|
NoNewPrivileges=yes
|
|
ProtectSystem=full
|
|
ProtectHome=read-only
|
|
PrivateTmp=yes
|
|
ProtectKernelTunables=yes
|
|
ProtectKernelModules=yes
|
|
ProtectControlGroups=yes
|
|
RestrictSUIDSGID=yes
|
|
LockPersonality=yes
|
|
# Writes release slots, pip installs into venv, manages agent.pid.
|
|
ReadWritePaths={{ install_dir }} /var/log/decnet
|
|
|
|
Restart=on-failure
|
|
RestartSec=5
|
|
# Self-update replaces the process image via os.execv; the new binary answers
|
|
# /health within 30 s. Give it headroom before systemd's own termination.
|
|
TimeoutStopSec=30
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|