Merge pull request '57/F2b: influxdb serves its org and bucket from its settings (issue 696)' (#290) from pkg/57-f2b-served-keys into feat/57-config-and-provisioning

modules/influxdb/module.json

@@ -26,12 +26,24 @@
       "why": "queries, writes and the web UI, over http; consumers granted influxdb-api sign in with the mesh's credential, and a name is a route grant"
     }
   ],
+  "settings": {
+    "org": {
+      "kind": "preference",
+      "default": "mesh",
+      "why": "the organisation influxdb-api names to its consumers; mesh is the one influxdb makes at its first start (server.env), and a machine whose server was set up with another sets its own (novox/hq issue 696, ADR 0348 clause 11)"
+    },
+    "bucket": {
+      "kind": "preference",
+      "default": "default",
+      "why": "the bucket influxdb-api names to its consumers; default is the one influxdb makes at its first start (server.env), and a machine whose server was set up with another sets its own (novox/hq issue 696, ADR 0348 clause 11)"
+    }
+  },
   "serves": {
     "influxdb-api": {
       "scheme": "http",
       "port": 8086,
-      "org": "mesh",
-      "bucket": "default"
+      "org": "${setting:org}",
+      "bucket": "${setting:bucket}"
     }
   },
   "receives": {
@@ -124,7 +136,13 @@
       "path": "${dir:mesh-state}/config.json",
       "mode": "0600",
       "content": "{}\n",
-      "merge": "json"
+      "merge": "json",
+      "takes-settings": [
+        "bucket",
+        "org",
+        "url"
+      ],
+      "trusted": true
     }
   ],
   "requires": [