From 258a3bec5192106e1e24e65763649b7f6943af9e Mon Sep 17 00:00:00 2001 From: St33v Date: Tue, 9 Jun 2026 17:11:47 +1000 Subject: Add Brisbane radar (IDR663) alongside Sydney radar.service / radar-retry.service now invoke radarFetch.sh once per product code, prefixed with `-` so one radar's outage does not skip the other. Landing page at / links to /sydney and /brisbane; each per-radar page is the familiar black-page full-image idiom with a small corner link to its sibling. setup.sh provisions the subdirs and installs all three pages. Co-Authored-By: Claude Opus 4.7 --- radar.brisbane.html | 18 ++++++++++++++++++ radar.index.html | 15 +++++++++++---- radar.sydney.html | 18 ++++++++++++++++++ setup.sh | 6 +++++- systemd/radar-retry.service | 3 ++- systemd/radar.service | 4 +++- 6 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 radar.brisbane.html create mode 100644 radar.sydney.html diff --git a/radar.brisbane.html b/radar.brisbane.html new file mode 100644 index 0000000..d3775d2 --- /dev/null +++ b/radar.brisbane.html @@ -0,0 +1,18 @@ + + + + +Radar — Brisbane + + + + Brisbane radar loop + + + diff --git a/radar.index.html b/radar.index.html index 63ecec6..8043d15 100644 --- a/radar.index.html +++ b/radar.index.html @@ -2,11 +2,18 @@ -Radar — Sydney +Radar -Sydney radar loop + + Sydney + Brisbane + diff --git a/radar.sydney.html b/radar.sydney.html new file mode 100644 index 0000000..5c5c69d --- /dev/null +++ b/radar.sydney.html @@ -0,0 +1,18 @@ + + + + +Radar — Sydney + + + + Sydney radar loop + + + diff --git a/setup.sh b/setup.sh index ae182bd..89994ae 100755 --- a/setup.sh +++ b/setup.sh @@ -63,13 +63,17 @@ chown "$OWNER:$OWNER" /srv/www/pestrel install -d -o "$OWNER" -g "$OWNER" /opt/radar install -d -o "$OWNER" -g "$OWNER" /var/lib/radar install -d -o "$OWNER" -g "$OWNER" /srv/www/radar +install -d -o "$OWNER" -g "$OWNER" /srv/www/radar/sydney +install -d -o "$OWNER" -g "$OWNER" /srv/www/radar/brisbane # --------------------------------------------------------------------------- # Web content # --------------------------------------------------------------------------- echo "==> Writing index.html..." install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/index.html" /srv/www/pestrel/index.html -install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/radar.index.html" /srv/www/radar/index.html +install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/radar.index.html" /srv/www/radar/index.html +install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/radar.sydney.html" /srv/www/radar/sydney/index.html +install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/radar.brisbane.html" /srv/www/radar/brisbane/index.html echo "==> Installing radarFetch.sh..." install -o "$OWNER" -g "$OWNER" -m 755 "$SCRIPT_DIR/radarFetch.sh" /opt/radar/radarFetch.sh diff --git a/systemd/radar-retry.service b/systemd/radar-retry.service index b878303..0a439fa 100644 --- a/systemd/radar-retry.service +++ b/systemd/radar-retry.service @@ -5,7 +5,8 @@ Description=Retry BOM radar fetch (after failure) Type=oneshot User=st33v WorkingDirectory=/var/lib/radar -ExecStart=/opt/radar/radarFetch.sh +ExecStart=-/opt/radar/radarFetch.sh IDR713 +ExecStart=-/opt/radar/radarFetch.sh IDR663 ExecStopPost=/bin/sh -c 'STATUS=SUCCESS; [ "$$EXIT_STATUS" != "0" ] && STATUS=FAILURE; logger -t radar-retry -p user.err "radar-retry $$STATUS exit=$$EXIT_STATUS"' SyslogIdentifier=radar-retry StandardOutput=journal diff --git a/systemd/radar.service b/systemd/radar.service index 8e9dd40..6995637 100644 --- a/systemd/radar.service +++ b/systemd/radar.service @@ -6,7 +6,9 @@ OnFailure=radar-retry.timer Type=oneshot User=st33v WorkingDirectory=/var/lib/radar -ExecStart=/opt/radar/radarFetch.sh +# `-` prefix: one radar's failure does not skip the next +ExecStart=-/opt/radar/radarFetch.sh IDR713 +ExecStart=-/opt/radar/radarFetch.sh IDR663 ExecStopPost=/bin/sh -c 'STATUS=SUCCESS; [ "$$EXIT_STATUS" != "0" ] && STATUS=FAILURE; logger -t radar -p user.err "radar $$STATUS exit=$$EXIT_STATUS"' SyslogIdentifier=radar StandardOutput=journal -- cgit v1.3