diff --git a/docker/dev-host/rivet-engine/config.jsonc b/docker/dev-host/rivet-engine/config.jsonc index 8b0573ec47..9c4f3f907f 100644 --- a/docker/dev-host/rivet-engine/config.jsonc +++ b/docker/dev-host/rivet-engine/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc index 6649068e6a..e4b8e697d8 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/0/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc index 6649068e6a..e4b8e697d8 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/1/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc index 6649068e6a..e4b8e697d8 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-a/rivet-engine/2/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc index 27d3b158e5..d1a422c5d7 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/0/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 2, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc index 27d3b158e5..d1a422c5d7 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/1/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 2, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc index 27d3b158e5..d1a422c5d7 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-b/rivet-engine/2/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 2, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc index 5786856035..a4ffd985f0 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/0/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 3, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc index 5786856035..a4ffd985f0 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/1/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 3, "datacenters": [ diff --git a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc index 5786856035..a4ffd985f0 100644 --- a/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc +++ b/docker/dev-multidc-multinode/datacenters/dc-c/rivet-engine/2/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 3, "datacenters": [ diff --git a/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc b/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc index 3b92515c04..394ca8dd52 100644 --- a/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc +++ b/docker/dev-multidc/datacenters/dc-a/rivet-engine/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc b/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc index 7d416d6add..1f4b7a9883 100644 --- a/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc +++ b/docker/dev-multidc/datacenters/dc-b/rivet-engine/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 2, "datacenters": [ diff --git a/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc b/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc index 015e5889e0..bc9000c79d 100644 --- a/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc +++ b/docker/dev-multidc/datacenters/dc-c/rivet-engine/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 3, "datacenters": [ diff --git a/docker/dev-multinode/rivet-engine/0/config.jsonc b/docker/dev-multinode/rivet-engine/0/config.jsonc index fcf13b9d3d..2b0907f0aa 100644 --- a/docker/dev-multinode/rivet-engine/0/config.jsonc +++ b/docker/dev-multinode/rivet-engine/0/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev-multinode/rivet-engine/1/config.jsonc b/docker/dev-multinode/rivet-engine/1/config.jsonc index fcf13b9d3d..2b0907f0aa 100644 --- a/docker/dev-multinode/rivet-engine/1/config.jsonc +++ b/docker/dev-multinode/rivet-engine/1/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev-multinode/rivet-engine/2/config.jsonc b/docker/dev-multinode/rivet-engine/2/config.jsonc index fcf13b9d3d..2b0907f0aa 100644 --- a/docker/dev-multinode/rivet-engine/2/config.jsonc +++ b/docker/dev-multinode/rivet-engine/2/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/dev/rivet-engine/config.jsonc b/docker/dev/rivet-engine/config.jsonc index 1416fef15e..745a4d41e7 100644 --- a/docker/dev/rivet-engine/config.jsonc +++ b/docker/dev/rivet-engine/config.jsonc @@ -1,4 +1,7 @@ { + "auth": { + "admin_token": "dev" + }, "guard": { "port": 6420 }, @@ -6,7 +9,6 @@ "host": "0.0.0.0", "port": 6421 }, - "logs": {}, "topology": { "datacenter_label": 1, "datacenters": [ diff --git a/docker/template/src/services/edge/rivet-engine.ts b/docker/template/src/services/edge/rivet-engine.ts index 4cb7e63247..f519f2b30b 100644 --- a/docker/template/src/services/edge/rivet-engine.ts +++ b/docker/template/src/services/edge/rivet-engine.ts @@ -8,7 +8,8 @@ export function generateDatacenterRivetEngine( context: TemplateContext, datacenter: Datacenter, ) { - const clickhouseHost = context.config.networkMode === "host" ? "127.0.0.1" : "clickhouse"; + const clickhouseHost = + context.config.networkMode === "host" ? "127.0.0.1" : "clickhouse"; const datacenters = []; for (let dc of context.config.datacenters) { @@ -24,7 +25,11 @@ export function generateDatacenterRivetEngine( // Generate a separate config file for each engine node for (let i = 0; i < datacenter.engines; i++) { - let serviceHost = context.getServiceHost("rivet-engine", datacenter.name, 0); + let serviceHost = context.getServiceHost( + "rivet-engine", + datacenter.name, + 0, + ); const topology = { datacenter_label: datacenter.id, datacenters, @@ -32,31 +37,24 @@ export function generateDatacenterRivetEngine( // Config structure matching Rust schema in packages/common/config/src/config/mod.rs const config = { - // guard config + auth: { + admin_token: "dev", + }, guard: { port: GUARD_PORT, // https is optional and not configured for local development }, - // api_peer config api_peer: { host: "0.0.0.0", port: API_PEER_PORT, }, - // logs config - logs: { - // redirect_logs_dir is optional - }, - // topology config topology, - // database & pubsub config postgres: { url: `postgresql://postgres:postgres@${context.getServiceHost("postgres", datacenter.name)}:5432/rivet_engine`, }, - // cache config cache: { driver: "in_memory", }, - // clickhouse config (optional) clickhouse: { http_url: `http://${clickhouseHost}:9300`, // TODO: native_url: `http://${clickhouseHost}:9301`, // TODO: @@ -72,7 +70,6 @@ export function generateDatacenterRivetEngine( }, secure: false, }, - // vector_http config (optional) vector_http: { host: context.getServiceHost("vector-client", datacenter.name), port: 5022,