From 2f601e8e27b4957b81301da5e7c1e40b79b8aced Mon Sep 17 00:00:00 2001
From: Brian Conway <bconway@rcesoftware.com>
Date: Sat, 16 Mar 2024 13:52:30 -0500
Subject: [PATCH] Update Chirpstack dependency to v4.7.0

- Update deployment ChirpStack regions.
- All test variations pass.
---
 build/deploy/atlas-deps/docker-compose.yml                   | 2 +-
 .../deploy/atlas-deps/volume/chirpstack/region_us915_0.toml  | 5 +++--
 .../deploy/atlas-deps/volume/chirpstack/region_us915_1.toml  | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/deploy/atlas-deps/docker-compose.yml b/build/deploy/atlas-deps/docker-compose.yml
index 1048e06a..2e062030 100644
--- a/build/deploy/atlas-deps/docker-compose.yml
+++ b/build/deploy/atlas-deps/docker-compose.yml
@@ -47,7 +47,7 @@ services:
       - ./volume/redis:/data
 
   chirpstack:
-    image: chirpstack/chirpstack:4
+    image: chirpstack/chirpstack:4.7
     command: -c /etc/chirpstack
     depends_on:
       - postgres
diff --git a/build/deploy/atlas-deps/volume/chirpstack/region_us915_0.toml b/build/deploy/atlas-deps/volume/chirpstack/region_us915_0.toml
index ad0390af..171c680e 100644
--- a/build/deploy/atlas-deps/volume/chirpstack/region_us915_0.toml
+++ b/build/deploy/atlas-deps/volume/chirpstack/region_us915_0.toml
@@ -1,4 +1,4 @@
-# sed -i '' -e '/^[[:blank:]]*#/d' -e '/^[[:blank:]]*$/d' -e 's/^[[:blank:]]*//' -e 's/^\[/\n[/' region_us915_0.toml
+# sed -i '' -e '/^[[:blank:]]*#/d' -e '/^[[:blank:]]*$/d' -e 's/^[[:blank:]]*//' -e 's/^\[/\n[/' chirpstack/configuration/region_us915_0.toml
 [[regions]]
 id="us915_0"
 description="US915 (channels 0-7 + 64)"
@@ -11,14 +11,15 @@ force_gws_private=false
 enabled="mqtt"
 
 [regions.gateway.backend.mqtt]
-event_topic="$share/csgroup/lora/us915_0/gateway/+/event/+"
 topic_prefix="lora/us915_0"
+share_name="csgroup"
 server="$CS_MQTT_SERVER"
 username="chirpstack"
 password="$CS_MQTT_PASSWORD"
 qos=0
 clean_session=false
 client_id="$CS_REGION_US915_0_MQTT_CLIENT_ID"
+keep_alive_interval="30s"
 ca_cert=""
 tls_cert=""
 tls_key=""
diff --git a/build/deploy/atlas-deps/volume/chirpstack/region_us915_1.toml b/build/deploy/atlas-deps/volume/chirpstack/region_us915_1.toml
index bbd9aa22..730c4262 100644
--- a/build/deploy/atlas-deps/volume/chirpstack/region_us915_1.toml
+++ b/build/deploy/atlas-deps/volume/chirpstack/region_us915_1.toml
@@ -1,4 +1,4 @@
-# sed -i '' -e '/^[[:blank:]]*#/d' -e '/^[[:blank:]]*$/d' -e 's/^[[:blank:]]*//' -e 's/^\[/\n[/' region_us915_1.toml
+# sed -i '' -e '/^[[:blank:]]*#/d' -e '/^[[:blank:]]*$/d' -e 's/^[[:blank:]]*//' -e 's/^\[/\n[/' chirpstack/configuration/region_us915_1.toml
 [[regions]]
 id="us915_1"
 description="US915 (channels 8-15 + 65)"
@@ -11,14 +11,15 @@ force_gws_private=false
 enabled="mqtt"
 
 [regions.gateway.backend.mqtt]
-event_topic="$share/csgroup/lora/us915_1/gateway/+/event/+"
 topic_prefix="lora/us915_1"
+share_name="csgroup"
 server="$CS_MQTT_SERVER"
 username="chirpstack"
 password="$CS_MQTT_PASSWORD"
 qos=0
 clean_session=false
 client_id="$CS_REGION_US915_1_MQTT_CLIENT_ID"
+keep_alive_interval="30s"
 ca_cert=""
 tls_cert=""
 tls_key=""