Update to LoRa Server v3. Update configuration files.

README.md

@@ -21,8 +21,8 @@ but keep in mind that for production usage it might need modifications.
 
 The LoRa Server components are pre-configured to work with the provided
 `docker-compose.yml` file and defaults to the EU868 LoRaWAN band. Please refer
-to the `configuration/loraserver/loraserver.toml` configuration file to
+to the `configuration/loraserver/examples` directory for more configuration
-configure a different band.
+examples.
 
 # Data persistence
 

configuration/lora-gateway-bridge/lora-gateway-bridge.toml

@@ -1,7 +1,7 @@
 # See https://www.loraserver.io/lora-gateway-bridge/install/config/ for a full
 # configuration example and documentation.
 
-[backend.mqtt]
+[integration.mqtt.auth.generic]
 server="tcp://mosquitto:1883"
 username=""
 password=""

configuration/loraserver/examples/loraserver.eu868.toml

@@ -0,0 +1,53 @@
+# See https://www.loraserver.io/loraserver/install/config/ for a full
+# configuration example and documentation.
+#
+# This file is for the EU868 band. See the examples/ folder for more
+# configuration examples.
+
+[postgresql]
+dsn="postgres://loraserver_ns:loraserver_ns@postgresql/loraserver_ns?sslmode=disable"
+
+[redis]
+url="redis://redis:6379"
+
+[network_server]
+net_id="000000"
+
+[network_server.band]
+name="EU_863_870"
+
+[network_server.network_settings]
+
+  [[network_server.network_settings.extra_channels]]
+  frequency=867100000
+  min_dr=0
+  max_dr=5
+
+  [[network_server.network_settings.extra_channels]]
+  frequency=867300000
+  min_dr=0
+  max_dr=5
+
+  [[network_server.network_settings.extra_channels]]
+  frequency=867500000
+  min_dr=0
+  max_dr=5
+
+  [[network_server.network_settings.extra_channels]]
+  frequency=867700000
+  min_dr=0
+  max_dr=5
+
+  [[network_server.network_settings.extra_channels]]
+  frequency=867900000
+  min_dr=0
+  max_dr=5
+
+[network_server.gateway.backend.mqtt]
+server="tcp://mosquitto:1883"
+
+[join_server.default]
+server="http://appserver:8003"
+
+[geolocation_server]
+server="geoserver:8005"

configuration/loraserver/examples/loraserver.us915.0.toml

@@ -0,0 +1,29 @@
+# See https://www.loraserver.io/loraserver/install/config/ for a full
+# configuration example and documentation.
+#
+# This file is for the US915 band (channels 0-7). See the examples/ folder for more
+# configuration examples.
+
+[postgresql]
+dsn="postgres://loraserver_ns:loraserver_ns@postgresql/loraserver_ns?sslmode=disable"
+
+[redis]
+url="redis://redis:6379"
+
+[network_server]
+net_id="000000"
+
+[network_server.band]
+name="US_902_928"
+
+  [network_server.network_settings]
+  enabled_uplink_channels=[0, 1, 2, 3, 4, 5, 6, 7]
+
+[network_server.gateway.backend.mqtt]
+server="tcp://mosquitto:1883"
+
+[join_server.default]
+server="http://appserver:8003"
+
+[geolocation_server]
+server="geoserver:8005"

configuration/loraserver/examples/loraserver.us915.1.toml

@@ -0,0 +1,32 @@
+# See https://www.loraserver.io/loraserver/install/config/ for a full
+# configuration example and documentation.
+#
+# This file is for the US915 band (channels 8-15). See the examples/ folder for more
+# configuration examples.
+#
+# Note: these channels are also used by TTN.
+
+[postgresql]
+dsn="postgres://loraserver_ns:loraserver_ns@postgresql/loraserver_ns?sslmode=disable"
+
+[redis]
+url="redis://redis:6379"
+
+[network_server]
+net_id="000000"
+
+[network_server.band]
+name="US_902_928"
+
+  [network_server.network_settings]
+  enabled_uplink_channels=[8, 9, 10, 11, 12, 13, 14, 15]
+
+[network_server.gateway.backend.mqtt]
+server="tcp://mosquitto:1883"
+
+[join_server.default]
+server="http://appserver:8003"
+
+[geolocation_server]
+server="geoserver:8005"
+

configuration/loraserver/loraserver.toml

@@ -1,5 +1,8 @@
 # See https://www.loraserver.io/loraserver/install/config/ for a full
 # configuration example and documentation.
+#
+# This file is for the EU868 band. See the examples/ folder for more
+# configuration examples.
 
 [postgresql]
 dsn="postgres://loraserver_ns:loraserver_ns@postgresql/loraserver_ns?sslmode=disable"
@@ -11,70 +14,37 @@ url="redis://redis:6379"
 net_id="000000"
 
 [network_server.band]
-# LoRaWAN band to use.
-#
-# Valid values are:
-# *	AS_923
-# * AU_915_928
-# * CN_470_510
-# * CN_779_787
-# * EU_433
-# * EU_863_870
-# * IN_865_867
-# * KR_920_923
-# * RU_864_870
-# * US_902_928
 name="EU_863_870"
 
 [network_server.network_settings]
-# Enable only a given sub-set of channels
-#
-# Use this when ony a sub-set of the by default enabled channels are being
-# used. For example when only using the first 8 channels of the US band.
-# 
-# Example:
-# enabled_uplink_channels=[0, 1, 2, 3, 4, 5, 6, 7]
-enabled_uplink_channels=[]
 
-# Extra channel configuration.
+  [[network_server.network_settings.extra_channels]]
-#
+  frequency=867100000
-# Use this for LoRaWAN regions where it is possible to extend the by default
+  min_dr=0
-# available channels with additional channels (e.g. the EU band).
+  max_dr=5
-# The first 5 channels will be configured as part of the OTAA join-response
-# (using the CFList field).
-# The other channels (or channel / data-rate changes) will be (re)configured
-# using the NewChannelReq mac-command.
-#
-# Example:
-# [[network_server.network_settings.extra_channels]]
-# frequency=867100000
-# min_dr=0
-# max_dr=5
 
-# [[network_server.network_settings.extra_channels]]
+  [[network_server.network_settings.extra_channels]]
-# frequency=867300000
+  frequency=867300000
-# min_dr=0
+  min_dr=0
-# max_dr=5
+  max_dr=5
 
-# [[network_server.network_settings.extra_channels]]
+  [[network_server.network_settings.extra_channels]]
-# frequency=867500000
+  frequency=867500000
-# min_dr=0
+  min_dr=0
-# max_dr=5
+  max_dr=5
 
-# [[network_server.network_settings.extra_channels]]
+  [[network_server.network_settings.extra_channels]]
-# frequency=867700000
+  frequency=867700000
-# min_dr=0
+  min_dr=0
-# max_dr=5
+  max_dr=5
 
-# [[network_server.network_settings.extra_channels]]
+  [[network_server.network_settings.extra_channels]]
-# frequency=867900000
+  frequency=867900000
-# min_dr=0
+  min_dr=0
-# max_dr=5
+  max_dr=5
 
 [network_server.gateway.backend.mqtt]
 server="tcp://mosquitto:1883"
-username=""
-password=""
 
 [join_server.default]
 server="http://appserver:8003"

docker-compose-env.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   loraserver:
-    image: loraserver/loraserver:2
+    image: loraserver/loraserver:3
     environment:
       - POSTGRESQL.DSN=postgres://loraserver_ns:loraserver_ns@postgresql/loraserver_ns?sslmode=disable
       - REDIS.URL=redis://redis:6379
@@ -12,7 +12,7 @@ services:
       - GEOLOCATION_SERVER.SERVER=geoserver:8005
 
   appserver:
-    image: loraserver/lora-app-server:2
+    image: loraserver/lora-app-server:3
     ports:
       - 8080:8080
     environment:
@@ -23,14 +23,14 @@ services:
       - APPLICATION_SERVER.EXTERNAL_API.JWT_SECRET=verysecret
 
   gatewaybridge:
-    image: loraserver/lora-gateway-bridge:2
+    image: loraserver/lora-gateway-bridge:3
     ports:
       - 1700:1700/udp
     environment:
-      - BACKEND.MQTT.AUTH.GENERIC.SERVER=tcp://mosquitto:1883
+      - INTEGRATION.MQTT.AUTH.GENERIC.SERVER=tcp://mosquitto:1883
 
   geoserver:
-    image: loraserver/lora-geo-server:2
+    image: loraserver/lora-geo-server:3
     environment:
       - GEO_SERVER.BACKEND.NAME=collos
 
@@ -41,7 +41,7 @@ services:
       - postgresqldata:/var/lib/postgresql/data
 
   redis:
-    image: redis:4-alpine
+    image: redis:5-alpine
     volumes:
       - redisdata:/data
 

docker-compose.yml

@@ -2,26 +2,26 @@ version: "3"
 
 services:
   loraserver:
-    image: loraserver/loraserver:2
+    image: loraserver/loraserver:3
     volumes:
       - ./configuration/loraserver:/etc/loraserver
 
   appserver:
-    image: loraserver/lora-app-server:2
+    image: loraserver/lora-app-server:3
     ports:
       - 8080:8080
     volumes:
       - ./configuration/lora-app-server:/etc/lora-app-server
 
   gatewaybridge:
-    image: loraserver/lora-gateway-bridge:2
+    image: loraserver/lora-gateway-bridge:3
     ports:
       - 1700:1700/udp
     volumes:
       - ./configuration/lora-gateway-bridge:/etc/lora-gateway-bridge
 
   geoserver:
-    image: loraserver/lora-geo-server:2
+    image: loraserver/lora-geo-server:3
     volumes:
       - ./configuration/lora-geo-server:/etc/lora-geo-server
 
@@ -32,14 +32,12 @@ services:
       - postgresqldata:/var/lib/postgresql/data
 
   redis:
-    image: redis:4-alpine
+    image: redis:5-alpine
     volumes:
       - redisdata:/data
 
   mosquitto:
     image: eclipse-mosquitto
-    ports:
-      - 1883:1883
 
 volumes:
   postgresqldata: