Name the setting keys searxng, keycloak and betterbird files take (hq issue 168, ADR 0326)
mesh/delivery rejected: the gate failed or could not run, or the repository's own check failed
mesh/merge-gate out of date: judged against a trunk it does not name, the trunk is now 22071dabfc7b; judged again on a recheck or when it is merged
mesh/repo-check out of date: judged against a trunk it does not name, the trunk is now 22071dabfc7b; judged again on a recheck or when it is merged

Every setting reached every mergeable file: searxng's endpoints landed in
its settings.yml, keycloak's issuer in its tools' config, betterbird's
prefs would land in its accounts file. Each file now names the keys it
reads, so the controller lays only those over it and calls the rest
stray. Merge only after the controller that knows takes-settings
(mesh-controller #272) has walked: an older one hands the field to the
node-engine, which refuses it.
This commit is contained in:
jochen
2026-10-12 17:47:27 +02:00
parent cd2b6aacd8
commit 2f55adc57c
3 changed files with 22 additions and 1 deletions
+3
View File
@@ -52,6 +52,9 @@
"owner": "${machine:account}",
"mode": "0600",
"merge": "json",
"takes-settings": [
"accounts"
],
"content": "{\n \"accounts\": {}\n}\n",
"trusted": true
},
+7 -1
View File
@@ -162,7 +162,13 @@
"path": "${dir:mesh-state}/config.json",
"mode": "0600",
"content": "{}\n",
"merge": "json"
"merge": "json",
"takes-settings": [
"url",
"user",
"realm",
"issuer"
]
}
],
"build": {
+12
View File
@@ -76,6 +76,18 @@
"path": "${dir:state}/settings.yml",
"mode": "0600",
"merge": "json",
"takes-settings": [
"general",
"brand",
"search",
"server",
"ui",
"outgoing",
"engines",
"plugins",
"categories_as_tabs",
"preferences"
],
"content": "{\n \"use_default_settings\": true,\n \"server\": {\n \"secret_key\": \"${secret:secret}\",\n \"base_url\": false,\n \"limiter\": false,\n \"image_proxy\": false,\n \"public_instance\": false\n },\n \"search\": {\n \"formats\": [\"html\", \"json\"]\n },\n \"valkey\": {\n \"url\": \"valkey://valkey:6379/0\"\n }\n}\n"
},
{