Merge branch 'master' into exp_24ghz

Author: brocaar

.circleci/config.yml

@@ -0,0 +1,41 @@
+version: 2
+jobs:
+  test:
+    machine:
+      image: circleci/classic:latest
+
+    steps:
+      - checkout
+      - run:
+          name: run tests
+          command: docker-compose run --rm chirpstack-network-server make test
+
+  deploy:
+    machine:
+      image: circleci/classic:latest
+
+    steps:
+      - checkout
+      - run:
+          name: compile distributable binaries
+          command: docker-compose run --rm chirpstack-network-server make dist
+      - run:
+          name: upload binaries to s3
+          command: aws s3 sync dist/upload s3://builds.loraserver.io/chirpstack-network-server
+
+workflows:
+  version: 2
+  test-and-deploy:
+    jobs:
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - deploy:
+          requires:
+            - test
+          filters:
+              tags:
+                only: /^v.*/
+              branches:
+                ignore: /.*/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "docs/themes/chirpstack-hugo-theme"]
+	path = docs/themes/chirpstack-hugo-theme
+	url = [email protected]:brocaar/chirpstack-hugo-theme.git

.goreleaser.yml

@@ -1,8 +1,8 @@
-project_name: loraserver
+project_name: chirpstack-network-server
 
 builds:
-  - main: cmd/loraserver/main.go
-    binary: loraserver
+  - main: cmd/chirpstack-network-server/main.go
+    binary: chirpstack-network-server
     goos:
       - windows
       - darwin
@@ -24,22 +24,23 @@ release:
   disable: true
 
 nfpm:
-  vendor: LoRa Server project
-  homepage: https://www.loraserver.io/
+  vendor: ChirpStack
+  homepage: https://www.chirpstack.io/
   maintainer: Orne Brocaar <[email protected]>
-  description: LoRa Server
+  description: ChirpStack Network Server
   license: MIT
   formats:
     - deb
   bindir: /usr/bin
   files:
-    "packaging/files/loraserver.rotate": "/etc/logrotate.d/loraserver"
-    "packaging/files/loraserver.init": "/usr/lib/loraserver/scripts/loraserver.init"
-    "packaging/files/loraserver.service": "/usr/lib/loraserver/scripts/loraserver.service"
-    "packaging/files/loraserver-eu868.toml": "/etc/loraserver/examples/loraserver-eu868.toml"
-    "packaging/files/loraserver-us915.toml": "/etc/loraserver/examples/loraserver-us915.toml"
+    "packaging/files/chirpstack-network-server.rotate": "/etc/logrotate.d/chirpstack-network-server"
+    "packaging/files/chirpstack-network-server.init": "/usr/lib/chirpstack-network-server/scripts/chirpstack-network-server.init"
+    "packaging/files/chirpstack-network-server.service": "/usr/lib/chirpstack-network-server/scripts/chirpstack-network-server.service"
+    "packaging/files/chirpstack-network-server-eu868.toml": "/etc/chirpstack-network-server/examples/chirpstack-network-server-eu868.toml"
+    "packaging/files/chirpstack-network-server-us915.toml": "/etc/chirpstack-network-server/examples/chirpstack-network-server-us915.toml"
   config_files:
-    "packaging/files/loraserver.toml": "/etc/loraserver/loraserver.toml"
+    "packaging/files/chirpstack-network-server.toml": "/etc/chirpstack-network-server/chirpstack-network-server.toml"
   scripts:
+    preinstall: "packaging/scripts/pre-install.sh"
     postinstall: "packaging/scripts/post-install.sh"
     postremove: "packaging/scripts/post-remove.sh"

.travis.yml

@@ -3,8 +3,8 @@
 There are a couple of ways to get involved:
 
 * Join the discussions:
-    * LoRa Server project forum [https://forum.loraserver.io/](https://forum.loraserver.io/)
-* Report bugs or make feature-requests by opening an issue at [https://github.com/brocaar/loraserver/issues](https://github.com/brocaar/loraserver/issues)
+    * ChirpStack community forum [https://forum.chirpstack.io/](https://forum.chirpstack.io/)
+* Report bugs or make feature-requests by opening an issue at [https://github.com/brocaar/chirpstack-network-server/issues](https://github.com/brocaar/chirpstack-network-server/issues)
 * Help fixing issues or improve documentation by creating pull-requests
 
 When you would like to add new features, please discuss the feature first

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 FROM golang:1.12-alpine AS development
 
-ENV PROJECT_PATH=/loraserver
+ENV PROJECT_PATH=/chirpstack-network-server
 ENV PATH=$PATH:$PROJECT_PATH/build
 ENV CGO_ENABLED=0
 ENV GO_EXTRA_BUILD_ARGS="-a -installsuffix cgo"
@@ -18,5 +18,5 @@ FROM alpine:latest AS production
 
 WORKDIR /root/
 RUN apk --no-cache add ca-certificates tzdata
-COPY --from=development /loraserver/build/loraserver .
-ENTRYPOINT ["./loraserver"]
+COPY --from=development /chirpstack-network-server/build/chirpstack-network-server .
+ENTRYPOINT ["./chirpstack-network-server"]

Dockerfile

@@ -1,6 +1,6 @@
 FROM golang:1.12-alpine
 
-ENV PROJECT_PATH=/loraserver
+ENV PROJECT_PATH=/chirpstack-network-server
 ENV PATH=$PATH:$PROJECT_PATH/build
 ENV CGO_ENABLED=0
 ENV GO_EXTRA_BUILD_ARGS="-a -installsuffix cgo"

Dockerfile-devel

@@ -1,11 +1,11 @@
 .PHONY: build clean test package serve update-vendor api statics
-PKGS := $(shell go list ./... | grep -v /vendor/ | grep -v loraserver/api | grep -v /migrations | grep -v /static)
+PKGS := $(shell go list ./... | grep -v /vendor/ | grep -v chirpstack-network-server/api | grep -v /migrations | grep -v /static)
 VERSION := $(shell git describe --always |sed -e "s/^v//")
 
 build: statics
 	@echo "Compiling source"
 	@mkdir -p build
-	go build $(GO_EXTRA_BUILD_ARGS) -ldflags "-s -w -X main.version=$(VERSION)" -o build/loraserver cmd/loraserver/main.go
+	go build $(GO_EXTRA_BUILD_ARGS) -ldflags "-s -w -X main.version=$(VERSION)" -o build/chirpstack-network-server cmd/chirpstack-network-server/main.go
 
 clean:
 	@echo "Cleaning up workspace"
@@ -22,7 +22,7 @@ test: statics
 	@go vet $(PKGS)
 	@go test -p 1 -v -cover $(PKGS) -coverprofile coverage.out
 
-dist:
+dist: statics
 	goreleaser
 	mkdir -p dist/upload/tar
 	mkdir -p dist/upload/deb
@@ -41,6 +41,7 @@ api:
 	go generate api/geo/geo.go
 	go generate api/common/common.go
 	go generate internal/storage/device_session.go
+	go generate internal/storage/downlink_frames.go
 
 statics:
 	@echo "Generating static files"
@@ -50,8 +51,6 @@ dev-requirements:
 	go install golang.org/x/lint/golint
 	go install golang.org/x/tools/cmd/stringer
 	go install github.com/golang/protobuf/protoc-gen-go
-	go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
-	go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
 	go install github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs
 	go install github.com/jteeuwen/go-bindata/go-bindata
 	go install github.com/goreleaser/goreleaser
@@ -60,8 +59,8 @@ dev-requirements:
 # shortcuts for development
 
 serve: build
-	@echo "Starting Lora Server"
-	./build/loraserver
+	@echo "Starting ChirpStack Network Server"
+	./build/chirpstack-network-server
 
 run-compose-test:
-	docker-compose run --rm loraserver make test
+	docker-compose run --rm networkserver make test

Makefile

@@ -1,42 +1,41 @@
-# LoRa Server
+# ChirpStack Network Server
 
-[![Build Status](https://travis-ci.org/brocaar/loraserver.svg?branch=master)](https://travis-ci.org/brocaar/loraserver)
+[![CircleCI](https://circleci.com/gh/brocaar/chirpstack-network-server.svg?style=svg)](https://circleci.com/gh/brocaar/chirpstack-network-server)
 
-LoRa Server is an open-source LoRaWAN network-server, part of the
-[LoRa Server](https://docs.loraserver.io/) project. It is responsible for
+ChirpStack Network Server is an open-source LoRaWAN network-server, part of
+[ChirpStack](https://www.chirpstack.io/). It is responsible for
 handling (and de-duplication) of uplink data received by the gateway(s)
 and the scheduling of downlink data transmissions.
 
 ## Architecture
 
-![architecture](https://docs.loraserver.io/img/architecture.png)
+![architecture](https://www.chirpstack.io/img/graphs/architecture.png)
 
 ### Component links
 
-* [LoRa Gateway Bridge](https://docs.loraserver.io/lora-gateway-bridge)
-* [LoRa Gateway Config](https://docs.loraserver.io/lora-gateway-config)
-* [LoRa Server](https://docs.loraserver.io/loraserver/)
-* [LoRa App Server](https://docs.loraserver.io/lora-app-server/)
+* [ChirpStack Gateway Bridge](https://www.chirpstack.io/gateway-bridge/)
+* [ChirpStack Network Server](https://www.chirpstack.io/network-server/)
+* [ChirpStack Application Server](https://www.chirpstack.io/application-server/)
 
 ## Links
 
-* [Downloads](https://docs.loraserver.io/loraserver/overview/downloads/)
-* [Docker image](https://hub.docker.com/r/loraserver/loraserver/)
-* [Documentation](https://docs.loraserver.io/loraserver/) and
-  [Getting started](https://docs.loraserver.io/loraserver/getting-started/)
-* [Building from source](https://docs.loraserver.io/loraserver/community/source/)
-* [Contributing](https://docs.loraserver.io/loraserver/community/contribute/)
+* [Downloads](https://www.chirpstack.io/network-server/overview/downloads/)
+* [Docker image](https://hub.docker.com/r/chirpstack/chirpstack-network-server/)
+* [Documentation](https://www.chirpstack.io/network-server/) and
+  [Getting started](https://www.chirpstack.io/network-server/getting-started/)
+* [Building from source](https://www.chirpstack.io/network-server/community/source/)
+* [Contributing](https://www.chirpstack.io/network-server/community/contribute/)
 * Support
-  * [Support forum](https://forum.loraserver.io)
-  * [Bug or feature requests](https://github.com/brocaar/loraserver/issues)
+  * [Support forum](https://forum.chirpstack.io)
+  * [Bug or feature requests](https://github.com/brocaar/chirpstack-network-server/issues)
 
 ## Sponsors
 
-[![CableLabs](https://www.loraserver.io/img/sponsors/cablelabs.png)](https://www.cablelabs.com/)
-[![SIDNFonds](https://www.loraserver.io/img/sponsors/sidn_fonds.png)](https://www.sidnfonds.nl/)
-[![acklio](https://www.loraserver.io/img/sponsors/acklio.png)](http://www.ackl.io/)
+[![CableLabs](https://www.chirpstack.io/img/sponsors/cablelabs.png)](https://www.cablelabs.com/)
+[![SIDNFonds](https://www.chirpstack.io/img/sponsors/sidn_fonds.png)](https://www.sidnfonds.nl/)
+[![acklio](https://www.chirpstack.io/img/sponsors/acklio.png)](http://www.ackl.io/)
 
 ## License
 
-LoRa Server is distributed under the MIT license. See also
-[LICENSE](https://github.com/brocaar/loraserver/blob/master/LICENSE).
+ChirpStack Network Server is distributed under the MIT license. See also
+[LICENSE](https://github.com/brocaar/chirpstack-network-server/blob/master/LICENSE).