diff --git a/Cargo.lock b/Cargo.lock index f65eab50..c30d39c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -574,7 +574,7 @@ dependencies = [ [[package]] name = "backend" -version = "4.0.0-test.4" +version = "4.0.0-test.5" dependencies = [ "aes-kw", "anyhow", @@ -800,7 +800,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chirpstack" -version = "4.0.0-test.4" +version = "4.0.0-test.5" dependencies = [ "aes 0.7.5", "anyhow", @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "chirpstack_api" -version = "4.0.0-test.4" +version = "4.0.0-test.5" dependencies = [ "hex", "pbjson", @@ -2041,7 +2041,7 @@ dependencies = [ [[package]] name = "lrwn" -version = "4.0.0-test.4" +version = "4.0.0-test.5" dependencies = [ "aes 0.7.5", "anyhow", diff --git a/api/grpc-web/package.json b/api/grpc-web/package.json index f9f66552..e8b95a82 100644 --- a/api/grpc-web/package.json +++ b/api/grpc-web/package.json @@ -1,6 +1,6 @@ { "name": "@chirpstack/chirpstack-api-grpc-web", - "version": "4.0.0-test.4", + "version": "4.0.0-test.5", "description": "Chirpstack gRPC-web API", "license": "MIT", "devDependencies": { diff --git a/api/js/package.json b/api/js/package.json index 12c1fe16..4c81ab75 100644 --- a/api/js/package.json +++ b/api/js/package.json @@ -1,6 +1,6 @@ { "name": "@chirpstack/chirpstack-api", - "version": "4.0.0-test.4", + "version": "4.0.0-test.5", "description": "Chirpstack JS and TS API", "license": "MIT", "devDependencies": { diff --git a/api/python/src/setup.py b/api/python/src/setup.py index 41a3a88c..b4a8c866 100644 --- a/api/python/src/setup.py +++ b/api/python/src/setup.py @@ -18,7 +18,7 @@ CLASSIFIERS = [ setup( name='chirpstack-api', - version = "4.0.0-test.4", + version = "4.0.0-test.5", url='https://github.com/brocaar/chirpstack-api', author='Orne Brocaar', author_email='info@brocaar.com', diff --git a/api/rust/Cargo.toml b/api/rust/Cargo.toml index 347c78f6..5a0d458f 100644 --- a/api/rust/Cargo.toml +++ b/api/rust/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "chirpstack_api" description = "ChirpStack Protobuf / gRPC API definitions." -version = "4.0.0-test.4" +version = "4.0.0-test.5" authors = ["Orne Brocaar "] license = "MIT" homepage = "https://www.chirpstack.io" diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 3613fe3a..28e84917 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "backend" -version = "4.0.0-test.4" +version = "4.0.0-test.5" authors = ["Orne Brocaar "] edition = "2018" publish = false diff --git a/chirpstack/Cargo.toml b/chirpstack/Cargo.toml index 7ed61b96..0feae05a 100644 --- a/chirpstack/Cargo.toml +++ b/chirpstack/Cargo.toml @@ -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.0.0-test.4" +version = "4.0.0-test.5" authors = ["Orne Brocaar "] edition = "2021" publish = false @@ -115,6 +115,39 @@ assets = [ ["configuration/certs/*.json", "etc/chirpstack/certs", "640"], ["debian/environment.conf", "etc/systemd/system/chirpstack.service.d/environment.conf", "640"], ] +conf-files = [ + "/etc/chirpstack/certs/ca-config.json", + "/etc/chirpstack/certs/ca-csr.json", + "/etc/chirpstack/certs/mqtt-server.json", + "/etc/chirpstack/chirpstack.toml", + "/etc/chirpstack/region_as923.toml", + "/etc/chirpstack/region_as923_2.toml", + "/etc/chirpstack/region_as923_3.toml", + "/etc/chirpstack/region_as923_4.toml", + "/etc/chirpstack/region_au915_0.toml", + "/etc/chirpstack/region_au915_1.toml", + "/etc/chirpstack/region_au915_2.toml", + "/etc/chirpstack/region_au915_3.toml", + "/etc/chirpstack/region_au915_4.toml", + "/etc/chirpstack/region_au915_5.toml", + "/etc/chirpstack/region_au915_6.toml", + "/etc/chirpstack/region_au915_7.toml", + "/etc/chirpstack/region_cn779.toml", + "/etc/chirpstack/region_eu433.toml", + "/etc/chirpstack/region_eu868.toml", + "/etc/chirpstack/region_in865.toml", + "/etc/chirpstack/region_ism2400.toml", + "/etc/chirpstack/region_kr920.toml", + "/etc/chirpstack/region_ru864.toml", + "/etc/chirpstack/region_us915_0.toml", + "/etc/chirpstack/region_us915_1.toml", + "/etc/chirpstack/region_us915_2.toml", + "/etc/chirpstack/region_us915_3.toml", + "/etc/chirpstack/region_us915_4.toml", + "/etc/chirpstack/region_us915_5.toml", + "/etc/chirpstack/region_us915_6.toml", + "/etc/chirpstack/region_us915_7.toml", +] depends = "$auto, golang-cfssl" suggests = "postgresql, mosquitto, redis" maintainer-scripts = "debian/" diff --git a/chirpstack/debian/postinst b/chirpstack/debian/postinst index 6668f8b7..e319ea60 100644 --- a/chirpstack/debian/postinst +++ b/chirpstack/debian/postinst @@ -8,7 +8,13 @@ chmod 640 /etc/chirpstack/*.toml # Generate certificates CERTROOT=/etc/chirpstack/certs -cfssl gencert -initca $CERTROOT/ca-csr.json | cfssljson -bare $CERTROOT/ca -cfssl gencert -ca $CERTROOT/ca.pem -ca-key $CERTROOT/ca-key.pem -config $CERTROOT/ca-config.json -profile server $CERTROOT/mqtt-server.json | cfssljson -bare $CERTROOT/mqtt-server + +if [ ! -f $CERTROOT/ca.pem ]; then + cfssl gencert -initca $CERTROOT/ca-csr.json | cfssljson -bare $CERTROOT/ca +fi + +if [ ! -f $CERTROOT/mqtt-server.pem ]; then + cfssl gencert -ca $CERTROOT/ca.pem -ca-key $CERTROOT/ca-key.pem -config $CERTROOT/ca-config.json -profile server $CERTROOT/mqtt-server.json | cfssljson -bare $CERTROOT/mqtt-server +fi #DEBHELPER# diff --git a/lrwn/Cargo.toml b/lrwn/Cargo.toml index aa889fbc..cb396f28 100644 --- a/lrwn/Cargo.toml +++ b/lrwn/Cargo.toml @@ -3,7 +3,7 @@ name = "lrwn" description = "Library for encoding / decoding LoRaWAN frames." homepage = "https://www.chirpstack.io" license = "MIT" -version = "4.0.0-test.4" +version = "4.0.0-test.5" authors = ["Orne Brocaar "] edition = "2018" repository = "https://github.com/chirpstack/chirpstack" diff --git a/ui/package.json b/ui/package.json index 47aa1ac5..07b661f8 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "chirpstack-ui", - "version": "4.0.0-test.4", + "version": "4.0.0-test.5", "private": true, "dependencies": { "@ant-design/colors": "^6.0.0",