mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 02:54:26 +00:00
kevinveenbirkenbachandClaude Opus 5
575a5a87ac
Every script a role ships now lives under `files/<language>/`, and the unit
suite is split the same way: `tests/unit/python/` beside new sibling trees for
the other languages. `tests/lint/filesystem/test_role_files_layout.py` keeps it
that way; directories whose shape is dictated from outside carry a `.nocheck`
naming the constraint (Docker build contexts, WordPress mu-plugins, the Joomla
extension, Odoo addons, Playwright suites, the `files/test/test.sh` harness
that `test-e2e-cli` resolves generically).
This cannot be applied in halves. Moving a file and repointing what names it
are the same change: 14 references resolve only at deploy time, so the tree is
green either before or after, never between.
Those 14 were found by static resolution over every reference class, not by the
test suite -- a full `make quality-high` was green while all of them were
broken:
* 7 `src:` values built from a role variable holding a bare filename
(svc-bkp-remote-2-local, decidim, espocrm, friendica, joomla, pixelfed x2).
The variable doubles as the destination name inside the container, so the
language segment belongs at the call site, not in the variable.
* `sys-service/tasks/04_base.yml` resolved every consumer's systemd script
through `first_found(..., errors='strict')` over `files/script.{sh,py}`.
18 roles ship exactly that and have no template fallback: the play would
have died on each.
* `sys-front-inj-javascript` fell back to `<role>/files/javascript.js`; the
interface now reads `files/javascript/javascript.js`.
* `sys-front-inj-logout/templates/head_sub.j2` built the cache-busting mtime
path through `path_absolute(... 'files', ...)`.
* 4 `ansible.builtin.script:` invocations naming a bare command
(pull.py, prune.sh, set_postgres_superuser_password.sh, ganesha-serve.sh).
* `dev-python/files/shell/install.sh` pointed at a sibling role's script.
Depth-dependent paths inside the moved trees were bumped accordingly: 59
`parents[N]` computations, 12 relative climbs, and the per-role recover CLI,
whose path `cli/administration/recover/recoverers.py` still assembled from the
pre-move location.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
88 lines
2.5 KiB
Python
Executable File
88 lines
2.5 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
import argparse
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import syslog
|
|
|
|
|
|
def run(cmd: list[str], cwd: str) -> None:
|
|
subprocess.run(cmd, cwd=cwd, check=True)
|
|
|
|
|
|
def log_kill(action: str, target: str) -> None:
|
|
syslog.openlog(ident="infinito-kill")
|
|
syslog.syslog(syslog.LOG_WARNING, f"sys-ctl-rpr-container-hard: {action} {target}")
|
|
|
|
|
|
def hard_restart_docker_services(dir_path: str) -> None:
|
|
"""
|
|
Perform a hard restart of compose services in the given directory
|
|
using compose wrapper (auto env + overrides).
|
|
"""
|
|
try:
|
|
abs_dir = os.path.abspath(dir_path)
|
|
project = os.path.basename(abs_dir)
|
|
|
|
print(f"Performing hard restart for compose project '{project}' in: {abs_dir}")
|
|
|
|
log_kill("compose down + up -d", project)
|
|
run(
|
|
["compose", "--chdir", abs_dir, "--project", project, "down"],
|
|
cwd=abs_dir,
|
|
)
|
|
run(
|
|
["compose", "--chdir", abs_dir, "--project", project, "up", "-d"],
|
|
cwd=abs_dir,
|
|
)
|
|
|
|
print(f"Hard restart completed successfully in: {abs_dir}")
|
|
except subprocess.CalledProcessError as e:
|
|
print(f"Error during hard restart in {dir_path}: {e}", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
|
|
def main() -> None:
|
|
parser = argparse.ArgumentParser(
|
|
description="Restart compose services in subdirectories (with compose wrapper)."
|
|
)
|
|
parser.add_argument(
|
|
"parent_directory",
|
|
help="Path to the parent directory containing compose projects",
|
|
)
|
|
parser.add_argument(
|
|
"--only", nargs="+", help="Restart only the specified subdirectories (by name)"
|
|
)
|
|
args = parser.parse_args()
|
|
|
|
parent_directory = args.parent_directory
|
|
|
|
if not os.path.isdir(parent_directory):
|
|
print(f"Error: {parent_directory} is not a valid directory.", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
for dir_entry in os.scandir(parent_directory):
|
|
if not dir_entry.is_dir():
|
|
continue
|
|
|
|
dir_path = dir_entry.path
|
|
dir_name = os.path.basename(dir_path)
|
|
print(f"Checking directory: {dir_path}")
|
|
|
|
compose_file = os.path.join(dir_path, "compose.yml")
|
|
if not os.path.isfile(compose_file):
|
|
print(f"No compose.yml found in {dir_path}. Skipping.")
|
|
continue
|
|
|
|
if args.only and dir_name not in args.only:
|
|
print(f"Skipping {dir_name} (not in --only list).")
|
|
continue
|
|
|
|
hard_restart_docker_services(dir_path)
|
|
|
|
print("Finished hard restart procedure.")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|