From ba84faaf144cd15af3aba2650c043467fe31ee06 Mon Sep 17 00:00:00 2001 From: St33v Date: Wed, 10 Jun 2026 13:30:38 +1000 Subject: Add Canberra and Cairns radars; cross-page nav Two new product codes: IDR403 (Canberra) and IDR193 (Cairns). radar.service / radar-retry.service gain two more ExecStart= lines. Per-radar pages: nav strip at top with all four radars + a Synoptic button linking to pestrel.com; current page is highlighted. Layout switched to column flex (nav on top, image fills below) and the image now uses `width: 100%; max-width: 512px` so it fills phone viewports without upscaling beyond the BOM-native 512px on desktop. Synoptic page (index.html): "Radars" button fixed to the left edge at top 16.6%, linking to https://radar.pestrel.com/. Landing page (radar.pestrel.com/): rebalanced for four radars plus a dashed-border Synoptic button. nginx/radar.pestrel.com.conf: pulled in the certbot-managed TLS block so a fresh setup matches production state. Co-Authored-By: Claude Opus 4.7 --- index.html | 16 ++++++++++++++-- nginx/radar.pestrel.com.conf | 26 ++++++++++++++++++++------ radar.brisbane.html | 28 +++++++++++++++++++++------- radar.cairns.html | 32 ++++++++++++++++++++++++++++++++ radar.canberra.html | 32 ++++++++++++++++++++++++++++++++ radar.index.html | 15 +++++++++++---- radar.sydney.html | 28 +++++++++++++++++++++------- setup.sh | 4 ++++ systemd/radar-retry.service | 2 ++ systemd/radar.service | 2 ++ 10 files changed, 159 insertions(+), 26 deletions(-) create mode 100644 radar.cairns.html create mode 100644 radar.canberra.html diff --git a/index.html b/index.html index 0aa07c7..219680a 100644 --- a/index.html +++ b/index.html @@ -2,12 +2,24 @@ + Synoptic -Latest synoptic + + Latest synoptic + Radars + - diff --git a/nginx/radar.pestrel.com.conf b/nginx/radar.pestrel.com.conf index b7d9c08..968bf2c 100644 --- a/nginx/radar.pestrel.com.conf +++ b/nginx/radar.pestrel.com.conf @@ -1,12 +1,8 @@ -# BOM radar loop — radar.pestrel.com +# BOM radar loops — radar.pestrel.com # Installed to /etc/nginx/conf.d/radar.conf by setup.sh -# -# Requires /etc/nginx/nginx.conf to include: -# include /etc/nginx/conf.d/*.conf; +# TLS block added by `certbot --nginx -d radar.pestrel.com`. server { - listen 80; - listen [::]:80; server_name radar.pestrel.com; root /srv/www/radar; @@ -20,4 +16,22 @@ server { location / { try_files $uri $uri/ =404; } + + listen 443 ssl; # managed by Certbot + listen [::]:443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/radar.pestrel.com/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/radar.pestrel.com/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot +} + +server { + if ($host = radar.pestrel.com) { + return 301 https://$host$request_uri; + } # managed by Certbot + + listen 80; + listen [::]:80; + server_name radar.pestrel.com; + return 404; # managed by Certbot } diff --git a/radar.brisbane.html b/radar.brisbane.html index d3775d2..d432c72 100644 --- a/radar.brisbane.html +++ b/radar.brisbane.html @@ -2,17 +2,31 @@ + Radar — Brisbane - Brisbane radar loop - + +
Brisbane radar loop
diff --git a/radar.cairns.html b/radar.cairns.html new file mode 100644 index 0000000..d4f3438 --- /dev/null +++ b/radar.cairns.html @@ -0,0 +1,32 @@ + + + + + +Radar — Cairns + + + + +
Cairns radar loop
+ + diff --git a/radar.canberra.html b/radar.canberra.html new file mode 100644 index 0000000..09f1200 --- /dev/null +++ b/radar.canberra.html @@ -0,0 +1,32 @@ + + + + + +Radar — Canberra + + + + +
Canberra radar loop
+ + diff --git a/radar.index.html b/radar.index.html index 8043d15..0bfea50 100644 --- a/radar.index.html +++ b/radar.index.html @@ -2,18 +2,25 @@ + Radar Sydney Brisbane + Canberra + Cairns + Synoptic diff --git a/radar.sydney.html b/radar.sydney.html index 5c5c69d..db2a216 100644 --- a/radar.sydney.html +++ b/radar.sydney.html @@ -2,17 +2,31 @@ + Radar — Sydney - Sydney radar loop - + +
Sydney radar loop
diff --git a/setup.sh b/setup.sh index 89994ae..a9b2fec 100755 --- a/setup.sh +++ b/setup.sh @@ -65,6 +65,8 @@ 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 +install -d -o "$OWNER" -g "$OWNER" /srv/www/radar/canberra +install -d -o "$OWNER" -g "$OWNER" /srv/www/radar/cairns # --------------------------------------------------------------------------- # Web content @@ -74,6 +76,8 @@ install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/index.html" /srv/www/pestrel 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 +install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/radar.canberra.html" /srv/www/radar/canberra/index.html +install -o "$OWNER" -g "$OWNER" -m 644 "$SCRIPT_DIR/radar.cairns.html" /srv/www/radar/cairns/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 0a439fa..eb29938 100644 --- a/systemd/radar-retry.service +++ b/systemd/radar-retry.service @@ -7,6 +7,8 @@ User=st33v WorkingDirectory=/var/lib/radar ExecStart=-/opt/radar/radarFetch.sh IDR713 ExecStart=-/opt/radar/radarFetch.sh IDR663 +ExecStart=-/opt/radar/radarFetch.sh IDR403 +ExecStart=-/opt/radar/radarFetch.sh IDR193 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 6995637..92852a3 100644 --- a/systemd/radar.service +++ b/systemd/radar.service @@ -9,6 +9,8 @@ WorkingDirectory=/var/lib/radar # `-` prefix: one radar's failure does not skip the next ExecStart=-/opt/radar/radarFetch.sh IDR713 ExecStart=-/opt/radar/radarFetch.sh IDR663 +ExecStart=-/opt/radar/radarFetch.sh IDR403 +ExecStart=-/opt/radar/radarFetch.sh IDR193 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