From ebecb26c7c59c9f9879ab02432a582606072ee8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A2ni=20Marques?= Date: Wed, 30 Sep 2026 12:52:38 +0200 Subject: [PATCH] scripts/dossiers-ngi/README.md: update branch-status-hourly.py reference --- .../user/dossiers-ngi-branch-status.service | 2 ++ scripts/dossiers-ngi/README.md | 4 +++- scripts/dossiers-ngi/branch-status-hourly.py | 14 ++++++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/configs/systemd/user/dossiers-ngi-branch-status.service b/configs/systemd/user/dossiers-ngi-branch-status.service index a6ad491..4a65aad 100644 --- a/configs/systemd/user/dossiers-ngi-branch-status.service +++ b/configs/systemd/user/dossiers-ngi-branch-status.service @@ -11,6 +11,8 @@ Environment=TZ=Europe/Zurich Environment=ADMIN_LOG=%h/src/koopa/koopa-admin-log # Override on koopa if the tdpd checkout path differs Environment=TDPD_ROOT=%h/git/src/ngi/tech-dossier-project-data +# Live site root (timer must refresh public JSON, not only the kal tree) +Environment=OUT=/var/www/monitoring-sites/dossiers.ngi.hacktivism.ch/branch-status.json EnvironmentFile=-%h/.config/dossiers-ngi/branch-status.env ExecStart=/usr/bin/python3 %h/src/koopa/koopa-admin-log/scripts/dossiers-ngi/branch-status-hourly.py SuccessExitStatus=0 1 diff --git a/scripts/dossiers-ngi/README.md b/scripts/dossiers-ngi/README.md index 37f674a..1b1131d 100644 --- a/scripts/dossiers-ngi/README.md +++ b/scripts/dossiers-ngi/README.md @@ -14,10 +14,12 @@ SoT for the blank cascade landing on **dossiers.ngi.hacktivism.ch** | Var | Default | Meaning | |-----|---------|---------| | `TDPD_ROOT` | `$HOME/git/src/ngi/tech-dossier-project-data` | tech-dossier-project-data checkout for tip SHAs | +| `OUT` | `sites/dossiers.ngi.hacktivism.ch/branch-status.json` under kal | write path for JSON (live www on koopa) | | `ADMIN_LOG` | (script derives from `__file__`) | koopa-admin-log root | On koopa the clone often lives at `%h/src/koopa/koopa-admin-log`; set -`TDPD_ROOT` in the service `Environment=` if the tdpd path differs. +`TDPD_ROOT` and `OUT` in `~/.config/dossiers-ngi/branch-status.env` when the +tdpd path or live www path differs from the laptop defaults. ## Manual run diff --git a/scripts/dossiers-ngi/branch-status-hourly.py b/scripts/dossiers-ngi/branch-status-hourly.py index e121273..4507313 100755 --- a/scripts/dossiers-ngi/branch-status-hourly.py +++ b/scripts/dossiers-ngi/branch-status-hourly.py @@ -21,9 +21,14 @@ from datetime import datetime, timezone from pathlib import Path ADMIN_LOG = Path(__file__).resolve().parents[2] -OUT = ADMIN_LOG / "sites" / "dossiers.ngi.hacktivism.ch" / "branch-status.json" +_DEFAULT_OUT = ADMIN_LOG / "sites" / "dossiers.ngi.hacktivism.ch" / "branch-status.json" HOST = "https://dossiers.ngi.hacktivism.ch" + +def out_path() -> Path: + raw = os.environ.get("OUT", "").strip() + return Path(raw).expanduser() if raw else _DEFAULT_OUT + # Default local clone; override with TDPD_ROOT (koopa may use a different path). DEFAULT_TDPD = Path.home() / "git" / "src" / "ngi" / "tech-dossier-project-data" @@ -76,9 +81,10 @@ def main() -> int: for b in branches ], } - OUT.parent.mkdir(parents=True, exist_ok=True) - OUT.write_text(json.dumps(payload, indent=2) + "\n", encoding="utf-8") - print(f"wrote {OUT}", file=sys.stderr) + dest = out_path() + dest.parent.mkdir(parents=True, exist_ok=True) + dest.write_text(json.dumps(payload, indent=2) + "\n", encoding="utf-8") + print(f"wrote {dest}", file=sys.stderr) return 0