From 984c497925da26e577a8a03d4c0113048b84e614 Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Wed, 16 Jun 2021 13:10:56 +0100 Subject: [PATCH] Remove chirpstack-geolocation-server. This component has been deprecated as Collos has been moved to Semtech LoRa Cloud and ChirpStack Application Server already provides an integration for LoRa Cloud Geolocation. --- .../chirpstack-geolocation-server.toml | 12 ------------ .../chirpstack-network-server.toml | 3 --- .../examples/chirpstack-network-server.eu868.toml | 3 --- .../examples/chirpstack-network-server.us915.0.toml | 3 --- .../examples/chirpstack-network-server.us915.1.toml | 3 --- docker-compose-env.yml | 5 ----- docker-compose.yml | 5 ----- 7 files changed, 34 deletions(-) delete mode 100644 configuration/chirpstack-geolocation-server/chirpstack-geolocation-server.toml diff --git a/configuration/chirpstack-geolocation-server/chirpstack-geolocation-server.toml b/configuration/chirpstack-geolocation-server/chirpstack-geolocation-server.toml deleted file mode 100644 index 2389c83..0000000 --- a/configuration/chirpstack-geolocation-server/chirpstack-geolocation-server.toml +++ /dev/null @@ -1,12 +0,0 @@ -# See https://www.chirpstack.io/geolocation-server/install/config/ for a full -# configuration example and documentation. - -[geo_server.backend] -name="collos" - -[geo_server.backend.collos] -# Collos subscription key. -# -# This key can be retrieved after creating a Collos account at: -# http://preview.collos.org/ -subscription_key="" diff --git a/configuration/chirpstack-network-server/chirpstack-network-server.toml b/configuration/chirpstack-network-server/chirpstack-network-server.toml index 10ec39c..64da619 100644 --- a/configuration/chirpstack-network-server/chirpstack-network-server.toml +++ b/configuration/chirpstack-network-server/chirpstack-network-server.toml @@ -48,6 +48,3 @@ server="tcp://mosquitto:1883" [join_server.default] server="http://chirpstack-application-server:8003" - -[geolocation_server] -server="chirpstack-geolocation-server:8005" diff --git a/configuration/chirpstack-network-server/examples/chirpstack-network-server.eu868.toml b/configuration/chirpstack-network-server/examples/chirpstack-network-server.eu868.toml index 10ec39c..64da619 100644 --- a/configuration/chirpstack-network-server/examples/chirpstack-network-server.eu868.toml +++ b/configuration/chirpstack-network-server/examples/chirpstack-network-server.eu868.toml @@ -48,6 +48,3 @@ server="tcp://mosquitto:1883" [join_server.default] server="http://chirpstack-application-server:8003" - -[geolocation_server] -server="chirpstack-geolocation-server:8005" diff --git a/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.0.toml b/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.0.toml index b737b7a..5dfeec4 100644 --- a/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.0.toml +++ b/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.0.toml @@ -24,6 +24,3 @@ server="tcp://mosquitto:1883" [join_server.default] server="http://chirpstack-application-server:8003" - -[geolocation_server] -server="chirpstack-geolocation-server:8005" diff --git a/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.1.toml b/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.1.toml index 86139e2..10c3d33 100644 --- a/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.1.toml +++ b/configuration/chirpstack-network-server/examples/chirpstack-network-server.us915.1.toml @@ -26,6 +26,3 @@ server="tcp://mosquitto:1883" [join_server.default] server="http://chirpstack-application-server:8003" - -[geolocation_server] -server="chirpstack-geolocation-server:8005" diff --git a/docker-compose-env.yml b/docker-compose-env.yml index e157a34..ff0d323 100644 --- a/docker-compose-env.yml +++ b/docker-compose-env.yml @@ -36,11 +36,6 @@ services: depends_on: - mosquitto - chirpstack-geolocation-server: - image: chirpstack/chirpstack-geolocation-server:3 - environment: - - GEO_SERVER__BACKEND__NAME=collos - postgresql: image: postgres:9.6-alpine environment: diff --git a/docker-compose.yml b/docker-compose.yml index 423c3ef..2052dd7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,11 +27,6 @@ services: depends_on: - mosquitto - chirpstack-geolocation-server: - image: chirpstack/chirpstack-geolocation-server:3 - volumes: - - ./configuration/chirpstack-geolocation-server:/etc/chirpstack-geolocation-server - postgresql: image: postgres:9.6-alpine environment: