From 64a5713b239b53bf8a3aee4ac9a3c808f3fa6cf2 Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Mon, 20 May 2019 14:15:11 +0200 Subject: [PATCH] Update to LoRa Server v3. Update configuration files. --- README.md | 4 +- .../lora-gateway-bridge.toml | 2 +- .../loraserver/examples/loraserver.eu868.toml | 53 +++++++++++++ .../examples/loraserver.us915.0.toml | 29 +++++++ .../examples/loraserver.us915.1.toml | 32 ++++++++ configuration/loraserver/loraserver.toml | 76 ++++++------------- docker-compose-env.yml | 12 +-- docker-compose.yml | 12 ++- 8 files changed, 151 insertions(+), 69 deletions(-) create mode 100644 configuration/loraserver/examples/loraserver.eu868.toml create mode 100644 configuration/loraserver/examples/loraserver.us915.0.toml create mode 100644 configuration/loraserver/examples/loraserver.us915.1.toml diff --git a/README.md b/README.md index c041e71..3db5f99 100644 --- a/README.md +++ b/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 -configure a different band. +to the `configuration/loraserver/examples` directory for more configuration +examples. # Data persistence diff --git a/configuration/lora-gateway-bridge/lora-gateway-bridge.toml b/configuration/lora-gateway-bridge/lora-gateway-bridge.toml index 60d68ee..b94818e 100644 --- a/configuration/lora-gateway-bridge/lora-gateway-bridge.toml +++ b/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="" diff --git a/configuration/loraserver/examples/loraserver.eu868.toml b/configuration/loraserver/examples/loraserver.eu868.toml new file mode 100644 index 0000000..ea1bb37 --- /dev/null +++ b/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" diff --git a/configuration/loraserver/examples/loraserver.us915.0.toml b/configuration/loraserver/examples/loraserver.us915.0.toml new file mode 100644 index 0000000..fea97c0 --- /dev/null +++ b/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" diff --git a/configuration/loraserver/examples/loraserver.us915.1.toml b/configuration/loraserver/examples/loraserver.us915.1.toml new file mode 100644 index 0000000..338b213 --- /dev/null +++ b/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" + diff --git a/configuration/loraserver/loraserver.toml b/configuration/loraserver/loraserver.toml index 2e8aa65..ea1bb37 100644 --- a/configuration/loraserver/loraserver.toml +++ b/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. -# -# Use this for LoRaWAN regions where it is possible to extend the by default -# available channels with additional channels (e.g. the EU band). -# 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]] + 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=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=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=867700000 + min_dr=0 + max_dr=5 -# [[network_server.network_settings.extra_channels]] -# frequency=867900000 -# 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" -username="" -password="" [join_server.default] server="http://appserver:8003" diff --git a/docker-compose-env.yml b/docker-compose-env.yml index 6c50e16..84ba6eb 100644 --- a/docker-compose-env.yml +++ b/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 diff --git a/docker-compose.yml b/docker-compose.yml index 125a094..655be2e 100644 --- a/docker-compose.yml +++ b/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: