From d46a22e2a6daed051a24ab3acbb31d7d7fbbaad1 Mon Sep 17 00:00:00 2001 From: George <86596679+notheowner@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:14:59 +0200 Subject: [PATCH 1/5] Update default env documentation. --- docs/pages/setup/docker.mdx | 6 +++--- docs/pages/setup/standard.mdx | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pages/setup/docker.mdx b/docs/pages/setup/docker.mdx index d2328527..0864122c 100644 --- a/docs/pages/setup/docker.mdx +++ b/docs/pages/setup/docker.mdx @@ -20,10 +20,10 @@ services: # Commented out variables are optional # Your Golbat or RDM database - SCANNER_DB_URL: 'mysql://rdm_user:rdm_password@host:3306/rdm_database' + SCANNER_DB_URL: 'mysql://golbat_user:golbat_passwordd@host:3306/golbat_database' - # Your Dragonite (if using) or RDM database (if you're using a hybrid Golbat/RDM setup) - # CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' + # Your Dragonite or RDM database (if you're using a hybrid Golbat/RDM setup) + CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' # Your Koji database KOJI_DB_URL: 'mysql://koji_user:koji_password@127.0.0.1:3306/koji_database' diff --git a/docs/pages/setup/standard.mdx b/docs/pages/setup/standard.mdx index c523d97b..78c73f6c 100644 --- a/docs/pages/setup/standard.mdx +++ b/docs/pages/setup/standard.mdx @@ -50,10 +50,10 @@ import { Callout } from 'nextra-theme-docs' # Commented out variables are optional # Your Golbat or RDM database - SCANNER_DB_URL='mysql://rdm_user:rdm_password@host:3306/rdm_database' + SCANNER_DB_URL='mysql://golbat_user:golbat_passwordd@host:3306/golbat_database' - # Your Dragonite (if using) or RDM database (if you're using a hybrid Golbat/RDM setup) - # CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' + # Your Dragonite or RDM database (if you're using a hybrid Golbat/RDM setup) + CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' # Your Koji database KOJI_DB_URL='mysql://koji_user:koji_password@127.0.0.1:3306/koji_database' From 4e5bdd87ef3d8c3e9798c2f729ce346e9904c2ec Mon Sep 17 00:00:00 2001 From: George <86596679+notheowner@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:22:55 +0200 Subject: [PATCH 2/5] Update integrations with ReactMap project setup. --- docs/pages/integrations.mdx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/pages/integrations.mdx b/docs/pages/integrations.mdx index 45c5c40b..6c248c21 100644 --- a/docs/pages/integrations.mdx +++ b/docs/pages/integrations.mdx @@ -24,6 +24,15 @@ In Kōji's architecture, various external integrations primarily leverage HTTP ` You can use unique project names for Multi-Domain setups! +### Project setup + +This is configured inside your Kōji `/admin/project` and will allow hot reloading of your areas within ReactMap. + +```yml +API Endpoint: http://{reactmap_ip}:{port}/api/v1/area/reload +API Key: react-map-secret:{config.api.reactMapSecret} +``` + ### Supported Features - Polygons ✅ @@ -33,7 +42,7 @@ In Kōji's architecture, various external integrations primarily leverage HTTP ` ## PoracleJS -- Remove the need to have a `geofence.json` file by loading your managed geofences straight from Kōji +- Remove the need to have a `geofence.json` file by loading your managed geofences straight from Kōji. - You must set two config values to use Kōji with Poracle 1. First set your Kōji Bearer Token: From 0eb0230e75b6a2a54c7f2fa31b38ed0ccdc9d085 Mon Sep 17 00:00:00 2001 From: George <86596679+notheowner@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:49:24 +0200 Subject: [PATCH 3/5] oops --- docs/pages/setup/docker.mdx | 2 +- docs/pages/setup/standard.mdx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pages/setup/docker.mdx b/docs/pages/setup/docker.mdx index 0864122c..bfad93ea 100644 --- a/docs/pages/setup/docker.mdx +++ b/docs/pages/setup/docker.mdx @@ -20,7 +20,7 @@ services: # Commented out variables are optional # Your Golbat or RDM database - SCANNER_DB_URL: 'mysql://golbat_user:golbat_passwordd@host:3306/golbat_database' + SCANNER_DB_URL: 'mysql://golbat_user:golbat_password@host:3306/golbat_database' # Your Dragonite or RDM database (if you're using a hybrid Golbat/RDM setup) CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' diff --git a/docs/pages/setup/standard.mdx b/docs/pages/setup/standard.mdx index 78c73f6c..d0f3a9c4 100644 --- a/docs/pages/setup/standard.mdx +++ b/docs/pages/setup/standard.mdx @@ -50,7 +50,7 @@ import { Callout } from 'nextra-theme-docs' # Commented out variables are optional # Your Golbat or RDM database - SCANNER_DB_URL='mysql://golbat_user:golbat_passwordd@host:3306/golbat_database' + SCANNER_DB_URL='mysql://golbat_user:golbat_password@host:3306/golbat_database' # Your Dragonite or RDM database (if you're using a hybrid Golbat/RDM setup) CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' From 665501501625b9d5445fa5e114524e2d79990d29 Mon Sep 17 00:00:00 2001 From: George <86596679+notheowner@users.noreply.github.com> Date: Fri, 5 Jan 2024 11:24:17 +0200 Subject: [PATCH 4/5] Update docker-compose example. --- docker-compose.example.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 28ad4bf2..65b46d27 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -9,10 +9,10 @@ services: # Commented out variables are optional # Your Golbat or RDM database - SCANNER_DB_URL: "mysql://rdm_user:rdm_password@host:3306/rdm_database" + SCANNER_DB_URL: "mysql://golbat_user:golbat_password@host:3306/golbat_database" - # Your Dragonite (if using) or RDM database (if you're using a hybrid Golbat/RDM setup) - # CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' + # Your Dragonite or RDM database (if you're using a hybrid Golbat/RDM setup) + CONTROLLER_DB_URL: 'mysql://dragonite_user:dragonite_password@host:3306/dragonite_database' # Your Koji database KOJI_DB_URL: "mysql://koji_user:koji_password@127.0.0.1:3306/koji_database" From 7bd5aa59719f30cb9c2eb8a5c3fdd8d54047c00c Mon Sep 17 00:00:00 2001 From: notheowner <86596679+notheowner@users.noreply.github.com> Date: Tue, 9 Jan 2024 15:29:56 +0200 Subject: [PATCH 5/5] Add Golbat project hot geojson reloading --- docs/pages/integrations.mdx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/pages/integrations.mdx b/docs/pages/integrations.mdx index 6c248c21..16d6b4f8 100644 --- a/docs/pages/integrations.mdx +++ b/docs/pages/integrations.mdx @@ -86,6 +86,15 @@ API Key: X-Poracle-Secret:{config.server.apiSecret} - `koji.url` - Example: `http://{koji_ip}/api/v1/geofence/feature-collection/{project_name}` +### Project setup + +This is configured inside your Kōji `/admin/project` and will allow hot reloading of your areas within Golbat. + +```yml +API Endpoint: http://{golbat_ip}:{port}/api/reload-geojson +API Key: x-golbat-secret:{golbat_config.api_secret} +``` + ### Supported Features - Polygons ✅