frugal-iot-server 2.0.8 → 2.0.10

package/frugal-iot-createdb.sql

@@ -108,7 +108,7 @@ CREATE TABLE IF NOT EXISTS `forwarders` (
 CREATE INDEX IF NOT EXISTS `forwarders_org` ON `forwarders` (`org`);
 
 -- A credential for Grafana (or anything else that reads history over HTTP), see lib/grafana.js and
--- GRAFANA.md. Read-only, and scoped to one organization: it can fetch that organization's readings
+-- docs/GRAFANA.md. Read-only, and scoped to one organization: it can fetch that organization's readings
 -- through /grafana/:org/ and nothing else.
 --
 -- Only a SHA-256 of the token is kept, so a copy of this database does not hand out working
@@ -269,3 +269,12 @@ CREATE TABLE IF NOT EXISTS `node_attempts` (
   `count` INTEGER NOT NULL DEFAULT 1,
   UNIQUE(`org`, `nodeid`)
 );
+
+-- Which languages browsers ask for, counted at each sign-in, to choose what to translate next - see
+-- lib/language-requests.js. Codes only: nothing records who asked.
+CREATE TABLE IF NOT EXISTS `language_requests` (
+  `code` TEXT PRIMARY KEY, -- lower-case, as the browser sent it: hi-in, pt-br
+  `count` INTEGER NOT NULL,
+  `last_seen` INTEGER NOT NULL,
+  `supported` INTEGER NOT NULL -- 1 if the client had a file for it at the last count
+);

package/frugal-iot-server.js

@@ -101,7 +101,7 @@ import morgan from 'morgan'; // https://www.npmjs.com/package/morgan - http requ
 
 // If you are developing comment out the Production line, and uncomment the Development line
 // Production
-import { MqttLogger } from "frugal-iot-logger";  // https://github.com/mitra42/frugal-iot-logger
+import { MqttLogger, backfillOpenSearch } from "frugal-iot-logger";  // https://github.com/mitra42/frugal-iot-logger
 // Development of Logger
 // import { MqttLogger } from "../frugal-iot-logger/index.js";  // https://github.com/mitra42/frugal-iot-logger
 
@@ -140,6 +140,7 @@ import crypto from 'crypto'; /* https://nodejs.org/api/crypto.html */
 import {waterfall, each} from 'async';
 import { mailInit, mailConfigured, sendMail } from './lib/mailer.js';
 import { resetCodeMake, resetCodeCheck, resetRateOk } from './lib/resetcode.js';
+import { countLanguages, parseBrowserLanguages } from './lib/language-requests.js';
 // import { openDB } from 'sqlite-express-package'; /* appContent, appSelect, validateId, validateAlias, tagCloud, atom, rss,*/
 
 export let config; // Live binding - lib/api-routes.js reads the current value at request time
@@ -155,8 +156,16 @@ function loginRedirect(res, { mode = 'signin', message, messagetype, url }) {
   if (message) { q.set('message', message); }
   if (messagetype) { q.set('messagetype', messagetype); }
   if (url) { q.set('url', url); }   // Encoded here: a return url usually has a query string of its own
+  const lang = langOf(url);
+  if (lang) { q.set('lang', lang); }
   res.redirect(`${loginUrl}?${q}`);
 }
+// The language of the page being returned to. login.html reads only its own ?lang=, and without it
+// falls back to the browser's language rather than the one picked before signing in.
+function langOf(url) {
+  if (!url) return null;
+  try { return new URL(url, 'http://localhost').searchParams.get('lang'); } catch (e) { return null; }
+}
 // A password reset link carries its token in the query string, and everything that logs a URL goes
 // to the journal, which outlives the ten minutes the token is good for.
 function redactUrl(url) {
@@ -1241,13 +1250,13 @@ mqttLogger.readYamlConfig('.', (err, configobj) => {
         app.use('/api', apiRouter);
         console.log("Mounted API routes at /api");
 
-        // History for Grafana, by bearer token - see lib/grafana.js and GRAFANA.md
+        // History for Grafana, by bearer token - see lib/grafana.js and docs/GRAFANA.md
         const grafana = createGrafanaRouters(db, config.server.datadir, loggerClient, { loggedInOrFail, can_READ });
         app.use('/grafana', grafana.data);
         app.use('/grafana_token', grafana.admin);
 
         // Where each organization's readings are forwarded, edited from the admin tab - lib/forwarders.js
-        app.use('/forwarders', createForwardersRouter(db, mqttLogger, () => config.organizations || {}, { loggedInOrFail, can_ADMIN }, { localOpenSearch: () => config.opensearch }));
+        app.use('/forwarders', createForwardersRouter(db, mqttLogger, () => config.organizations || {}, { loggedInOrFail, can_ADMIN }, { localOpenSearch: () => config.opensearch, backfill: backfillOpenSearch, dataDir: config.server.datadir }));
         app.use('/opensearch_access', createAccessRouter(() => config.organizations || {}, { loggedInOrFail, can_READ }, () => config.opensearch));
         console.log("Mounted Grafana routes at /grafana");
 
@@ -1273,21 +1282,33 @@ mqttLogger.readYamlConfig('.', (err, configobj) => {
           (req,res,next) => {
             console.log("Trying to login with redirect to",req.body.url);
             // This is ugly, but I cannot see how to pass the URL to passport.authenticate options
-            // Default the destination rather than trusting every caller to supply one: with no
-            // successRedirect, passport calls next() on success and the request 404s as
-            // "Cannot POST /login" - a confusing way to report a missing form field.
+            // Default the destination rather than trusting every caller to supply one - a missing
+            // form field should still land somewhere, here and in the success handler below.
             const returnTo = req.body.url || '/dashboard';
             const failureQuery = new URLSearchParams({
               mode: 'signin', messagetype: 'error',
               message: 'Incorrect username or password', url: returnTo });
+            const lang = langOf(returnTo);
+            if (lang) { failureQuery.set('lang', lang); }
             passport.authenticate('local', {
               session: true,
               //failWithError: true,
               failureRedirect: `${loginUrl}?${failureQuery}`,
-              successRedirect: returnTo,
+              // No successRedirect: on success passport calls next(), which counts and then redirects
               // In failure case will also be messages in the session which need clearing out TODO-N89
               //failureRedirect: `${loginUrl}?register=false&message=Incorrect+username+or+password&url=${req.body.url}`,
             })(req, res, next);
+          },
+          // Counted only once signed in, so failed attempts cannot pad the numbers. Not waited for.
+          (req, res) => {
+            const codes = parseBrowserLanguages(req.body.browserlangs);
+            if (codes.length) {
+              console.log("Browser languages", codes.join(','));
+              countLanguages(db, config.server.htmldir, codes, (err) => {
+                if (err) console.error("Could not count browser languages:", err.message);
+              });
+            }
+            res.redirect(req.body.url || '/dashboard');
           }
         );
         app.post('/register', (req, res) => {

package/lib/forwarders.js

@@ -212,15 +212,17 @@ export function typesFor(localOpenSearch) {
 // configuration (config.d/opensearch.yaml), so those never pass through the browser or the database.
 // A local row on a server that no longer has one is left out.
 export async function enabledConfigs(db, org, localOpenSearch) {
-  const out = [];
-  for (const r of (await listRows(db, org)).filter((x) => x.enabled)) {
-    const config = JSON.parse(r.config);
-    if (r.type !== 'opensearch-local') { out.push({ type: r.type, ...config }); continue; }
-    if (!localOpenSearch || !localOpenSearch.node) continue;
-    const { node, username, password, apiKey, insecure } = localOpenSearch;
-    out.push({ type: 'opensearch', node, username, password, apiKey, insecure, ...config });
-  }
-  return out;
+  return (await listRows(db, org)).filter((x) => x.enabled)
+    .map((r) => loggerConfig(r, localOpenSearch)).filter(Boolean);
+}
+
+// One row as the logger takes it, or undefined for a local row on a server that no longer has one
+export function loggerConfig(row, localOpenSearch) {
+  const config = JSON.parse(row.config);
+  if (row.type !== 'opensearch-local') return { type: row.type, ...config };
+  if (!localOpenSearch || !localOpenSearch.node) return undefined;
+  const { node, username, password, apiKey, insecure } = localOpenSearch;
+  return { type: 'opensearch', node, username, password, apiKey, insecure, ...config };
 }
 
 /**
@@ -229,8 +231,9 @@ export async function enabledConfigs(db, org, localOpenSearch) {
  * @param orgs         () => the organizations configuration, { org: {...} }
  * @param auth         { loggedInOrFail, can_ADMIN } from frugal-iot-server.js, passed in so tests can stand in
  * @param localOpenSearch  () => the server's own OpenSearch settings, or undefined (config.d/opensearch.yaml)
+ * @param backfill     the logger's backfillOpenSearch, and dataDir where the readings are (tests stand in)
  */
-export function createForwardersRouter(db, mqttLogger, orgs, auth, { lookup, localOpenSearch = () => undefined } = {}) {
+export function createForwardersRouter(db, mqttLogger, orgs, auth, { lookup, localOpenSearch = () => undefined, backfill, dataDir } = {}) {
   const router = Router();
   // Whole-organization ADMIN: a forwarder sends every project's readings
   const guard = [auth.loggedInOrFail, auth.can_ADMIN, orgWideAdmin];
@@ -308,5 +311,41 @@ export function createForwardersRouter(db, mqttLogger, orgs, auth, { lookup, loc
     } catch (err) { next(err); }
   });
 
+  // Sending the readings already on disk to an OpenSearch forwarder. It can take minutes, so the request
+  // only starts it; the card asks how it is getting on. One at a time per forwarder, and the last
+  // outcome is kept (in memory - it is gone at a restart) for the card to show.
+  const jobs = new Map();
+  const DAY = /^\d{4}-\d{2}-\d{2}$/;
+
+  router.post('/:org/backfill', ...guard, orgExists, jsonOnly, express.json({ limit: '1kb' }), async (req, res, next) => {
+    try {
+      const org = req.params.org;
+      if (!backfill || !dataDir) return fail(res, 501, 'This server cannot send earlier readings');
+      const { id, since, dryRun } = req.body || {};
+      if (since !== undefined && since !== '' && (!DAY.test(since) || Number.isNaN(Date.parse(since)) || new Date(since).toISOString().slice(0, 10) !== since)) return fail(res, 400, 'Give the date as YYYY-MM-DD');
+      const row = await get(db, 'SELECT * FROM forwarders WHERE id = ? AND org = ?', [id, org]);
+      if (!row) return fail(res, 404, 'No such forwarder');
+      if (!['opensearch', 'opensearch-local'].includes(row.type)) return fail(res, 400, 'Only OpenSearch forwarders can be sent earlier readings');
+      if (!row.enabled) return fail(res, 400, 'Make the forwarder active first');
+      const config = loggerConfig(row, localOpenSearch());
+      if (!config) return fail(res, 400, 'This server has no OpenSearch of its own any more');
+      const key = `${org}:${row.id}`;
+      if (jobs.has(key) && jobs.get(key).running) return fail(res, 409, 'Already sending - wait for it to finish');
+      const job = { running: true, sent: 0, dryRun: !!dryRun, since: since || null, startedAt: Date.now() };
+      jobs.set(key, job);
+      backfill({ config, org, dataDir, since: since || undefined, dryRun: !!dryRun, progress: (n) => { job.sent = n; } })
+        .then((r) => { job.sent = r.sent; job.skippedFiles = r.skippedFiles; })
+        .catch((err) => { job.error = err.message; console.error(`Backfill for ${org} failed:`, err); })
+        .finally(() => { job.running = false; job.finishedAt = Date.now(); });
+      console.log('Backfill started by', req.user.username, '-', org, JSON.stringify(row.name), since || 'all', dryRun ? 'dry run' : '');
+      res.status(202).json({ started: true });
+    } catch (err) { next(err); }
+  });
+
+  router.get('/:org/backfill/:id', ...guard, orgExists, (req, res) => {
+    res.set('Cache-Control', 'no-store');
+    res.json(jobs.get(`${req.params.org}:${req.params.id}`) || { running: false });
+  });
+
   return router;
 }

package/lib/grafana.js

@@ -21,7 +21,7 @@
  *   GET  /grafana_token/:org                   list names and when last used (yours; all, for an org-wide administrator)
  *   POST /grafana_token/:org/revoke  {name}   yours; any, for an org-wide administrator
  *
- * See GRAFANA.md for setting up Grafana to use these.
+ * See docs/GRAFANA.md for setting up Grafana to use these.
  */
 
 import crypto from 'crypto';
@@ -398,7 +398,7 @@ export function createGrafanaRouters(db, dataDir, loggerClient, auth) {
       res.json(rows.map(({ user_id, ...t }) => ({ ...t, mine: user_id === Number(req.user.id) })));
     } catch (err) { next(err); }
   });
-  // The starter dashboard, to save and import into Grafana (GRAFANA.md). Nothing in it is secret.
+  // The starter dashboard, to save and import into Grafana (docs/GRAFANA.md). Nothing in it is secret.
   admin.get('/:org/dashboard', auth.loggedInOrFail, auth.can_READ, async (req, res, next) => {
     try {
       const dash = await dashboardFor(req.params.org, String(req.query.server || ''));

package/lib/language-requests.js

@@ -0,0 +1,50 @@
+/*
+ * Which languages people's browsers ask for, counted at each sign-in, so the next language to
+ * translate is the one most asked for (frugal-iot-client docs/LANGUAGES_PLAN.md, Phase 3). Codes
+ * only - nothing records who asked.
+ *
+ * To read it: SELECT * FROM language_requests ORDER BY supported, count DESC;
+ */
+import { existsSync } from 'fs';
+import { join } from 'path';
+
+// A browser sends a handful; anything longer is not a browser
+const MAX_CODES = 10;
+const CODE = /^[a-z]{2,3}(-[a-z0-9]{1,8}){0,3}$/;
+// As languageAliases in the client's core.js: browsers call Tagalog "fil", and its file is tl.yaml
+const ALIASES = { fil: 'tl' };
+
+// The form field is untrusted: keep only what looks like a language tag, lower-cased, once each
+export function parseBrowserLanguages(value) {
+  if (typeof value !== 'string') return [];
+  const codes = value.split(',').map((c) => c.trim().toLowerCase()).filter((c) => CODE.test(c));
+  return [...new Set(codes)].slice(0, MAX_CODES);
+}
+
+// The client has a file per language it supports, so whether one exists is the answer, and the
+// server keeps no list of its own. fr-CA is served by fr, as the client matches it; English is the
+// keys themselves, so it has no file.
+export function isSupported(htmldir, code) {
+  const primary = ALIASES[code.split('-')[0]] || code.split('-')[0];
+  if (primary === 'en') return true;
+  return [code, primary].some((c) => existsSync(join(htmldir, 'languages', `${c}.yaml`)));
+}
+
+// One upsert per code. cb(err) - a failure to count must never stand in the way of a login
+export function countLanguages(db, htmldir, codes, cb = () => {}) {
+  const now = Date.now();
+  let pending = codes.length;
+  let failed = null;
+  if (!pending) { cb(null); return; }
+  codes.forEach((code) => {
+    db.run(
+      `INSERT INTO language_requests (code, count, last_seen, supported) VALUES (?, 1, ?, ?)
+       ON CONFLICT(code) DO UPDATE SET count = count + 1, last_seen = excluded.last_seen,
+                                       supported = excluded.supported`,
+      [code, now, isSupported(htmldir, code) ? 1 : 0],
+      (err) => {
+        failed = failed || err;
+        if (--pending === 0) cb(failed);
+      });
+  });
+}

package/lib/opensearch-access.js

@@ -60,12 +60,14 @@ export const namesFor = (org, username) => ({
 export function roleFor(org) {
   const n = namesFor(org);
   return {
-    cluster_permissions: ['cluster_composite_ops', 'cluster:monitor/main', 'cluster:monitor/health'],
+    cluster_permissions: ['cluster_composite_ops', 'cluster:monitor/main', 'cluster:monitor/health', 'cluster:monitor/nodes/info', 'cluster:monitor/state'],
     index_permissions: [
       { index_patterns: [n.dataPattern],
         allowed_actions: ['read', 'indices:admin/get', 'indices:admin/mappings/get',
           'indices:admin/resolve/index', 'indices:monitor/settings/get'] },
       { index_patterns: [n.savedIndex, `${n.savedIndex}_*`], allowed_actions: ['indices_all'] },
+      // Dashboards looks an alias up before it makes one, and OpenSearch checks that against every index
+      { index_patterns: ['*'], allowed_actions: ['indices:admin/aliases/get'] },
     ],
   };
 }
@@ -156,7 +158,11 @@ export function dashboardsConfig(cfg, org, username, password) {
     `opensearch.username: ${JSON.stringify(n.user)}`,
     `opensearch.password: ${JSON.stringify(password)}`,
     `opensearchDashboards.index: ${JSON.stringify(n.savedIndex)}`,
-    'opensearch.requestHeadersAllowlist: [ authorization ]',
+    // Dashboards uses the login above only for its own housekeeping, and leaves it off requests made for a
+    // browser - which would then ask for one. A header set here goes on every request and a browser cannot
+    // override it, so nobody is asked.
+    'opensearch.requestHeadersAllowlist: []',
+    `opensearch.customHeaders: { authorization: ${JSON.stringify('Basic ' + Buffer.from(`${n.user}:${password}`).toString('base64'))} }`,
   ].join('\n');
 }
 
@@ -200,6 +206,7 @@ export function createAccessRouter(orgs, auth, localOpenSearch = () => undefined
           all: has(req, 'ADMIN') ? all : undefined });
       } catch (err) {
         if (err instanceof AccessError) return res.json({ available: false, reason: err.message });
+        console.error('OpenSearch Dashboards access: could not reach', cfg.node, '-', err.code || '', err.message);
         return res.json({ available: false, reason: 'OpenSearch did not answer' });
       }
     } catch (err) { next(err); }

package/package.json

@@ -12,8 +12,8 @@
     "cookie-parser": "^1.4.7",
     "express": "^5.2.1",
     "express-session": "^1.19.0",
-    "frugal-iot-client": "^2.0.8",
-    "frugal-iot-logger": "^2.0.8",
+    "frugal-iot-client": "^2.0.10",
+    "frugal-iot-logger": "^2.0.10",
     "hash-wasm": "^4.12.0",
     "js-yaml": "^4.2.0",
     "morgan": "^1.11.0",
@@ -64,9 +64,10 @@
     "extras/frugaliot-ap-watchdog.service",
     "extras/frugaliot-ap-watchdog.timer",
     "API.md",
-    "GRAFANA.md",
-    "INSTALL-OPENSEARCH.md",
-    "INSTALLATION.md"
+    "docs/GRAFANA.md",
+    "docs/INSTALL-OPENSEARCH.md",
+    "docs/INSTALLATION.md",
+    "docs/OPENWRT.md"
   ],
   "devDependencies": {
     "supertest": "^7.2.2",
@@ -93,7 +94,7 @@
     "check-files": "node scripts/check-published-files.js"
   },
   "type": "module",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "overrides": {
     "uuid": "^11.1.1"
   }

package/public/service-worker.js

@@ -6,7 +6,7 @@
 // it, an installed browser keeps serving the files it already cached - and since the list now covers
 // the dashboard's own code, that means old JS behind freshly fetched HTML. Any edit to the list
 // needs this bumped, or it does not reach anyone who already has the old one.
-const CACHE_NAME = 'frugal-iot-cache-2.0.8';
+const CACHE_NAME = 'frugal-iot-cache-2.0.10';
 /*
  * Everything the app needs, so that a phone on a poor or expensive link fetches it once.
  *
@@ -100,6 +100,14 @@ self.addEventListener('fetch', event => {
         // Scoped to CACHE_NAME: a bare caches.match searches every cache in the origin, so a
         // leftover older cache answers first and the version bump achieves nothing
         caches.match(event.request, {cacheName: CACHE_NAME})
-            .then(response => response || fetch(event.request))
+            .then(response => response || fetch(event.request).then(fetched => {
+                // A language is cached when first used, not at install: there are many, and a
+                // phone wants one
+                if (fetched.ok && new URL(event.request.url).pathname.startsWith('/dashboard/languages/')) {
+                    const copy = fetched.clone();
+                    caches.open(CACHE_NAME).then(cache => cache.put(event.request, copy));
+                }
+                return fetched;
+            }))
     );
 });

package/scripts/addbridge-pi.zsh

@@ -5,7 +5,7 @@
 # After this, the Pi's readings also appear on the production server, and its nodes can be
 # controlled from there - while the Pi carries on recording and serving on its own whenever the
 # link is down. Readings taken during an outage stay on the Pi: production gets a gap rather than
-# a backlog delivered later with the wrong timestamps. INSTALLATION.md step 11 explains why.
+# a backlog delivered later with the wrong timestamps. docs/INSTALLATION.md step 11 explains why.
 #
 # The relaying is done by the broker, so the server, the logger and the nodes are untouched.
 #

package/scripts/addbridge-prod.zsh

@@ -24,7 +24,7 @@
 # printed - it is needed once, to type into the Pi.
 #
 # This assumes the server has already been set up to accept bridges at all: a TLS listener on 8883
-# with a certificate. That is a one-off, and INSTALLATION.md step 11 covers it.
+# with a certificate. That is a one-off, and docs/INSTALLATION.md step 11 covers it.
 
 set -euo pipefail
 
@@ -255,7 +255,7 @@ else
   echo ""
   echo "NOTE: this broker has no acl_file, so ${ACCOUNT} can reach every topic on it, not just"
   echo "  ${ORG_ID}/#. That is how the broker already treats every other account, so this is no"
-  echo "  worse than what is there - but see INSTALLATION.md step 11 for restricting it."
+  echo "  worse than what is there - but see docs/INSTALLATION.md step 11 for restricting it."
 fi
 
 # password_file and acl_file are both re-read on a reload, so nothing needs to be disconnected.

package/scripts/addorganization.zsh

@@ -133,11 +133,20 @@ if [[ ! -w "$MOSQUITTO_PASSWD_DIR" || ( -e "$MOSQUITTO_PASSWD_FILE" && ! -w "$MO
     fi
   fi
 fi
+# Run as root there is no sudo to go through (OpenWrt has none, and runs everything as root), and
+# mosquitto_passwd then rewrites the file as root - which the broker, running as its own account,
+# cannot read. So when root is doing it and somebody else owns the file, hand it back afterwards.
+if (( EUID == 0 )) && [[ -n "$MOSQUITTO_PASSWD_OWNER" && "$MOSQUITTO_PASSWD_OWNER" != "root" ]]; then
+  MOSQUITTO_RESTORE_OWNER=1
+fi
 # Called after any successful mosquitto_passwd run below
 restore_passwd_owner() {
   (( MOSQUITTO_RESTORE_OWNER )) || return 0
-  sudo chown "${MOSQUITTO_PASSWD_OWNER}:${MOSQUITTO_PASSWD_GROUP}" "$MOSQUITTO_PASSWD_FILE"
-  [[ -n "$MOSQUITTO_PASSWD_MODE" ]] && sudo chmod "$MOSQUITTO_PASSWD_MODE" "$MOSQUITTO_PASSWD_FILE"
+  local SUDO=(sudo)
+  (( EUID == 0 )) && SUDO=()
+  "${SUDO[@]}" chown "${MOSQUITTO_PASSWD_OWNER}:${MOSQUITTO_PASSWD_GROUP}" "$MOSQUITTO_PASSWD_FILE"
+  [[ -n "$MOSQUITTO_PASSWD_MODE" ]] && "${SUDO[@]}" chmod "$MOSQUITTO_PASSWD_MODE" "$MOSQUITTO_PASSWD_FILE"
+  return 0
 }
 
 # ---- Escaping helpers ----

package/scripts/diagnostic.zsh

@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 #
-# Report the state of a Frugal IoT installation, for working out why something in INSTALLATION.md
+# Report the state of a Frugal IoT installation, for working out why something in docs/INSTALLATION.md
 # did not do what it said it would. It only looks - it changes nothing.
 #
 # Run it from the directory the server is installed in (the one holding frugal-iot.db):
@@ -85,7 +85,7 @@ for c in node npm sqlite3 zsh mosquitto mosquitto_passwd mosquitto_sub; do
     esac
   else
     item "$c: NOT INSTALLED"
-    [[ $c == (node|npm|sqlite3) ]] && problem "$c is not installed - see INSTALLATION.md step 3"
+    [[ $c == (node|npm|sqlite3) ]] && problem "$c is not installed - see docs/INSTALLATION.md step 3"
   fi
 done
 
@@ -355,7 +355,7 @@ broker_setting() {  # name -> value from the broker's own configuration, sudo on
 broker_setting acl_file; ACLFILE="$BROKER_SETTING"
 if [[ -z "$ACLFILE" ]]; then
   item "acl_file: NOT SET - every account that can log in can reach every topic, across all organizations"
-  problem "The broker has no acl_file. Re-run the install script, or see INSTALLATION.md 'Turn on access control'"
+  problem "The broker has no acl_file. Re-run the install script, or see docs/INSTALLATION.md 'Turn on access control'"
 else
   item "acl_file: $ACLFILE"
   if [[ -r "$ACLFILE" ]] || { have sudo && sudo -n test -r "$ACLFILE" 2>/dev/null; }; then
@@ -608,7 +608,7 @@ else
 fi
 
 # Swapping to an SD card wears it fast. On a Pi 4 there should be little or none; a Pi Zero W may
-# need some. See INSTALLATION.md, "Wear and tear on the SD card".
+# need some. See docs/INSTALLATION.md, "Wear and tear on the SD card".
 if have free; then
   item "swap:        $(free -h | awk '/^Swap:/ {print $3 " used of " $2}')"
 fi

package/scripts/grafana-token.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /*
- * Issue, list or revoke the tokens Grafana uses to read an organization's history (GRAFANA.md).
+ * Issue, list or revoke the tokens Grafana uses to read an organization's history (docs/GRAFANA.md).
  *
  *   npx --no frugal-iot-grafana-token add <org> <username> <name>   prints the token - once, it is not kept
  *   npx --no frugal-iot-grafana-token list <org>

package/scripts/init.zsh

@@ -48,7 +48,11 @@ copy_if_missing() {
     fi
   elif [[ -e "$from" ]]; then
     mkdir -p "${to:h}"
-    cp "$from" "$to"
+    # extras/ holds a directory (grafana/) as well as files, and a plain cp refuses a directory -
+    # which under "set -e" ended the whole init, after server.yaml had been created but before it
+    # was pointed at node_modules. The re-run then saw an existing server.yaml and left it alone, so
+    # "/" 404ed. -R for a directory, so a failure here cannot strand a half-initialised install.
+    if [[ -d "$from" ]]; then cp -R "$from" "$to"; else cp "$from" "$to"; fi
     COPIED+=("$to")
     echo "  created ${to}"
   fi