Compare commits

...

2 Commits

Author SHA1 Message Date
f13a5f492c Bump version to 4.6.0-test.3 2023-11-22 11:28:00 +00:00
c0cd3a3361 Remove env variables from example config.
Initially this was added to make development using Docker Compose easier.
However, in my experience Docker Compose is not great for the reason
that there might be environmental differences between Rust running in
Compose and Rust running outside Compose (if using VSCode with Rust
plugin, then rust-analyzer will perform checks in the background). This
and 'cross' not working properly in Compose was the reason to migrate
to nix, as it provides a reproducible environment for development that
can also be used by VSCode (using the Nix environment selector
extension) and GitHub Actions (for the CI pipeline).

As the chirpstack-docker repository provides its own configuration files,
these files are not included in the Dockerfile and because we are
rewriting these env variables anyway to 'localhost' in the .deb and .rpm
post-installation script, it is better to set these to localhost by
default.

The post-installation rewrite to 'localhost' is causing issues on
upgrade (#295). If we only do the rewrite on initial installation, then
we run in an other issue; the package-manager will prompt that the
config file has changed (from 'localhost' to '$MQTT_BROKER_HOST' for
example) and will ask if you would like to overwrite or not. If the
end-user would accept the config changes without looking at the diff
this would break the installation as most likely, these environment are
not set (which is why we were rewriting these to 'localhost' in the first
place).
2023-11-22 11:10:13 +00:00
54 changed files with 63 additions and 75 deletions

10
Cargo.lock generated
View File

@ -460,7 +460,7 @@ dependencies = [
[[package]]
name = "backend"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
dependencies = [
"aes-kw",
"anyhow",
@ -682,7 +682,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chirpstack"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
dependencies = [
"aes",
"anyhow",
@ -760,7 +760,7 @@ dependencies = [
[[package]]
name = "chirpstack_api"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
dependencies = [
"hex",
"pbjson",
@ -2207,7 +2207,7 @@ dependencies = [
[[package]]
name = "lrwn"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
dependencies = [
"aes",
"anyhow",
@ -2221,7 +2221,7 @@ dependencies = [
[[package]]
name = "lrwn_filters"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
dependencies = [
"hex",
"lrwn",

View File

@ -1,6 +1,6 @@
{
"name": "@chirpstack/chirpstack-api-grpc-web",
"version": "4.6.0-test.2",
"version": "4.6.0-test.3",
"description": "Chirpstack gRPC-web API",
"license": "MIT",
"devDependencies": {

View File

@ -8,7 +8,7 @@ plugins {
}
group = "io.chirpstack"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
repositories {
mavenCentral()

2
api/js/package.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "@chirpstack/chirpstack-api",
"version": "4.6.0-test.2",
"version": "4.6.0-test.3",
"description": "Chirpstack JS and TS API",
"license": "MIT",
"devDependencies": {

View File

@ -9,7 +9,7 @@ plugins {
}
group = "io.chirpstack"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
repositories {
mavenCentral()

View File

@ -18,7 +18,7 @@ CLASSIFIERS = [
setup(
name='chirpstack-api',
version = "4.6.0-test.2",
version = "4.6.0-test.3",
url='https://github.com/brocaar/chirpstack-api',
author='Orne Brocaar',
author_email='info@brocaar.com',

2
api/rust/Cargo.lock generated vendored
View File

@ -172,7 +172,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chirpstack_api"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
dependencies = [
"hex",
"pbjson",

2
api/rust/Cargo.toml vendored
View File

@ -1,7 +1,7 @@
[package]
name = "chirpstack_api"
description = "ChirpStack Protobuf / gRPC API definitions."
version = "4.6.0-test.2"
version = "4.6.0-test.3"
authors = ["Orne Brocaar <info@brocaar.com>"]
license = "MIT"
homepage = "https://www.chirpstack.io"

View File

@ -1,6 +1,6 @@
[package]
name = "backend"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
authors = ["Orne Brocaar <info@brocaar.com>"]
edition = "2018"
publish = false

View File

@ -3,7 +3,7 @@ name = "chirpstack"
description = "ChirpStack is an open-source LoRaWAN(TM) Network Server"
repository = "https://github.com/chirpstack/chirpstack"
homepage = "https://www.chirpstack.io/"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
authors = ["Orne Brocaar <info@brocaar.com>"]
edition = "2021"
publish = false
@ -201,10 +201,6 @@ post_install_script = '''
chown -R chirpstack:chirpstack /etc/chirpstack
chmod 750 /etc/chirpstack
chmod 640 /etc/chirpstack/*.toml
sed -i "s/\$MQTT_BROKER_HOST/localhost/" /etc/chirpstack/*.toml
sed -i "s/\$POSTGRESQL_HOST/localhost/" /etc/chirpstack/*.toml
sed -i "s/\$REDIS_HOST/localhost/" /etc/chirpstack/*.toml
'''
assets = [

View File

@ -19,7 +19,7 @@
# * require - Always SSL (skip verification)
# * verify-ca - Always SSL (verify that the certificate presented by the server was signed by a trusted CA)
# * verify-full - Always SSL (verify that the certification presented by the server was signed by a trusted CA and the server host name matches the one in the certificate)
dsn="postgres://chirpstack:chirpstack@$POSTGRESQL_HOST/chirpstack?sslmode=disable"
dsn="postgres://chirpstack:chirpstack@localhost/chirpstack?sslmode=disable"
# Max open connections.
#
@ -41,7 +41,7 @@
#
# Set multiple addresses when connecting to a cluster.
servers=[
"redis://$REDIS_HOST/",
"redis://localhost/",
]
# Redis Cluster.
@ -99,5 +99,5 @@
enabled=["mqtt"]
[integration.mqtt]
server="tcp://$MQTT_BROKER_HOST:1883/"
server="tcp://localhost:1883/"
json=true

View File

@ -38,7 +38,7 @@
topic_prefix="as923"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="as923_2"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="as923_3"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="as923_4"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_0"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_1"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_2"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_3"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_4"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_5"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_6"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="au915_7"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_0"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_1"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_10"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_11"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_2"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_3"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_4"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_5"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_6"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_7"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_8"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn470_9"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="cn779"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="eu433"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="eu868"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="in865"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="ism2400"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="kr920"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="ru864"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_0"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_1"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_2"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_3"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_4"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_5"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_6"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -38,7 +38,7 @@
topic_prefix="us915_7"
# MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
server="tcp://$MQTT_BROKER_HOST:1883"
server="tcp://localhost:1883"
# Connect with the given username (optional)
username=""

View File

@ -1,16 +1,8 @@
#!/usr/bin/env bash
# Only execute on first install
if [[ -z $2 ]]; then
# Set config-file permissions
chown -R chirpstack:chirpstack /etc/chirpstack
chmod 750 /etc/chirpstack
chmod 640 /etc/chirpstack/*.toml
# Set environment variables to localhost
sed -i "s/\$MQTT_BROKER_HOST/localhost/" /etc/chirpstack/*.toml
sed -i "s/\$POSTGRESQL_HOST/localhost/" /etc/chirpstack/*.toml
sed -i "s/\$REDIS_HOST/localhost/" /etc/chirpstack/*.toml
fi
# Set config-file permissions
chown -R chirpstack:chirpstack /etc/chirpstack
chmod 750 /etc/chirpstack
chmod 640 /etc/chirpstack/*.toml
#DEBHELPER#

View File

@ -3,7 +3,7 @@ name = "lrwn_filters"
description = "Library for filtering LoRaWAN payloads on DevAddr and JoinEUIs prefixes"
homepage = "https://www.chirpstack.io/"
license = "MIT"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
authors = ["Orne Brocaar <info@brocaar.com>"]
edition = "2021"
repository = "https://github.com/chirpstack/chirpstack"

View File

@ -3,7 +3,7 @@ name = "lrwn"
description = "Library for encoding / decoding LoRaWAN frames."
homepage = "https://www.chirpstack.io"
license = "MIT"
version = "4.6.0-test.2"
version = "4.6.0-test.3"
authors = ["Orne Brocaar <info@brocaar.com>"]
edition = "2018"
repository = "https://github.com/chirpstack/chirpstack"

View File

@ -1,6 +1,6 @@
{
"name": "chirpstack-ui",
"version": "4.6.0-test.2",
"version": "4.6.0-test.3",
"private": true,
"dependencies": {
"@ant-design/colors": "^7.0.0",