5284e28af7
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>
53 lines
1 KiB
Bash
Executable file
53 lines
1 KiB
Bash
Executable file
#!/bin/sh
|
|
set -eu
|
|
|
|
usage() {
|
|
printf '%s\n' "usage: left4me-journalctl <server-name> --lines <n> --follow|--no-follow" >&2
|
|
exit 2
|
|
}
|
|
|
|
validate_name() {
|
|
name=$1
|
|
[ -n "$name" ] || usage
|
|
case "$name" in
|
|
.*|*..*|*/*|*\\*) usage ;;
|
|
esac
|
|
case "$name" in
|
|
*[!A-Za-z0-9_.-]*) usage ;;
|
|
esac
|
|
}
|
|
|
|
[ "$#" -eq 4 ] || usage
|
|
name=$1
|
|
lines_flag=$2
|
|
lines=$3
|
|
follow_flag=$4
|
|
|
|
validate_name "$name"
|
|
[ "$lines_flag" = "--lines" ] || usage
|
|
case "$lines" in
|
|
''|*[!0-9]*) usage ;;
|
|
esac
|
|
|
|
follow_arg=
|
|
case "$follow_flag" in
|
|
--follow) follow_arg=-f ;;
|
|
--no-follow) ;;
|
|
*) usage ;;
|
|
esac
|
|
|
|
unit="left4me-server@${name}.service"
|
|
if [ -x /bin/journalctl ]; then
|
|
journalctl=/bin/journalctl
|
|
elif [ -x /usr/bin/journalctl ]; then
|
|
journalctl=/usr/bin/journalctl
|
|
else
|
|
printf '%s\n' 'journalctl not found at /bin/journalctl or /usr/bin/journalctl' >&2
|
|
exit 69
|
|
fi
|
|
|
|
if [ -n "$follow_arg" ]; then
|
|
exec "$journalctl" -u "$unit" -n "$lines" -o cat "$follow_arg"
|
|
fi
|
|
|
|
exec "$journalctl" -u "$unit" -n "$lines" -o cat
|