Pulls the 5 privileged helpers out of deploy/files/usr/local/{libexec,sbin}/
into top-level scripts/{libexec,sbin}/. They are application-inherent code
(invoked at runtime via sudo from l4d2host/l4d2web), not deploy artifacts —
the previous nesting under deploy/files/ confused source-of-truth with
install-target FHS layout.
deploy/ now means "reference exemplar": README explaining the target
layout, plus example sudoers / sysctl / sandbox-resolv.conf / env
templates / curated systemd units (the ones ckn-bw's reactor emits).
Anyone building a fresh deployment (other than ckn-bw) reads this tree.
Dead static artifacts deleted: left4me-apply-cake helper, left4me-cake
+ left4me-nft-mark service units, cake.env, left4me-mark.nft, and the
superseded deploy-test-server.sh installer.
Tests split to match the new shape:
- scripts/tests/{test_overlay,test_script_sandbox,test_systemctl_helper,
test_journalctl_helper,test_helpers_use_fixed_paths,test_sudoers_grants}.py
with shared fixtures in conftest.py
- deploy/tests/test_example_units.py (renamed from test_deploy_artifacts.py)
— slimmed to lock down the curated example units, sysctl, env templates
l4d2host/tests/test_overlay_helper.py: helper-source path updated to
scripts/libexec/left4me-overlay (was building the path segment-by-segment
under deploy/files/, missed by the path-prefix grep during pre-flight).
Runtime install-target paths (/usr/local/{libexec,sbin}/) unchanged, so
l4d2host/service_control.py, l4d2web/services/overlay_builders.py, the
sudoers grants, and the systemd units all keep their existing path
references.
Requires the matching ckn-bw change to bundles/left4me/items.py
(install_left4me_scripts repointed from /opt/left4me/src/deploy/files/...
to /opt/left4me/src/scripts/...). Left4me lands first so a fresh
git_deploy exposes the new source path before the bundle apply runs.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
17 lines
552 B
Bash
Executable file
17 lines
552 B
Bash
Executable file
#!/bin/sh
|
|
# Run l4d2web flask CLI commands as the left4me user with the deploy env loaded.
|
|
# Usage: left4me <flask-subcommand> [args...]
|
|
# Examples:
|
|
# left4me create-user alice --admin
|
|
# left4me seed-script-overlays /opt/left4me/src/examples/script-overlays
|
|
# left4me routes
|
|
set -eu
|
|
exec sudo -u left4me sh -c '
|
|
set -a
|
|
. /etc/left4me/host.env
|
|
. /etc/left4me/web.env
|
|
set +a
|
|
export JOB_WORKER_ENABLED=false
|
|
export PYTHONPATH=/opt/left4me/src
|
|
exec /opt/left4me/.venv/bin/flask --app l4d2web.app:create_app "$@"
|
|
' sh "$@"
|