From 6282ce2109d1327d9197ed0e6d857bd054e72502 Mon Sep 17 00:00:00 2001
From: Orne Brocaar <info@brocaar.com>
Date: Mon, 17 Sep 2018 14:36:46 +0200
Subject: [PATCH] Add LoRa Geo Server.

---
 README.md                                          |  1 +
 configuration/lora-geo-server/lora-geo-server.toml | 12 ++++++++++++
 configuration/loraserver/loraserver.toml           |  3 +++
 docker-compose.yml                                 |  9 +++++----
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 configuration/lora-geo-server/lora-geo-server.toml

diff --git a/README.md b/README.md
index 5ca7a60..7d514e7 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ but keep in mind that for production usage it might need modifications.
     * https://www.loraserver.io/lora-gateway-bridge/install/config/
     * https://www.loraserver.io/loraserver/install/config/
     * https://www.loraserver.io/lora-app-server/install/config/
+    * https://www.loraserver.io/lora-geo-server/install/config/
 * `configuration/postgresql/initdb/`: directory containing PostgreSQL initialization scripts
 * `data/postgresql`: directory containing the PostgreSQL data (auto-created)
 * `data/redis`: directory containing the Redis data (auto-created)
diff --git a/configuration/lora-geo-server/lora-geo-server.toml b/configuration/lora-geo-server/lora-geo-server.toml
new file mode 100644
index 0000000..e8161e7
--- /dev/null
+++ b/configuration/lora-geo-server/lora-geo-server.toml
@@ -0,0 +1,12 @@
+# See https://www.loraserver.io/lora-geo-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/loraserver/loraserver.toml b/configuration/loraserver/loraserver.toml
index 10bd12a..2e8aa65 100644
--- a/configuration/loraserver/loraserver.toml
+++ b/configuration/loraserver/loraserver.toml
@@ -78,3 +78,6 @@ password=""
 
 [join_server.default]
 server="http://appserver:8003"
+
+[geolocation_server]
+server="geoserver:8005"
diff --git a/docker-compose.yml b/docker-compose.yml
index c61dde3..450aba7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,17 +20,18 @@ services:
     volumes:
       - ./configuration/lora-gateway-bridge:/etc/lora-gateway-bridge
   
+  geoserver:
+    image: loraserver/lora-geo-server:2
+    volumes:
+      - ./configuration/lora-geo-server:/etc/lora-geo-server
+  
   postgresql:
     image: postgres:9.6-alpine
-    ports:
-      - 5432
     volumes:
       - ./configuration/postgresql/initdb:/docker-entrypoint-initdb.d
       - ./data/postgresql:/var/lib/postgresql/data
 
   redis:
-    ports:
-      - 6379
     image: redis:4-alpine
     volumes:
       - ./data/redis:/data