PR changes

Author: AugustHA-Iterator

README.md

@@ -78,7 +78,7 @@ Solution:
 5. restart the application.
 
 ## Adding an ADR Algorithm
-When the ADR Algorithm has been tested, and is ready for deployment, the ADR Algorithm has to be added to chirpstack.
+When the ADR Algorithm has been tested, and is ready for deployment, the ADR Algorithm has to be added to chirpstack. It is mandatory that the custom adr module is writtin in js.
 
 ### Adding the Plugin to Chirpstack
 If the default `docker-compose.yml` file is used, the folder `./configuration/chirpstack` is already copied to `/etc/chirpstack` in the docker container.

configuration/chirpstack/chirpstack.toml

@@ -2,17 +2,13 @@
 dsn="postgres://chirpstack:chirpstack@postgresCsV4/chirpstack?sslmode=disable"
 
 [redis]
-servers=[
-  "redis://redis:6379",
-]
+servers=["redis://redis:6379"]
 
 [network]
   net_id="000000"
   adr_plugins=["/etc/chirpstack/adr-modules/sensade-adr-mod/sensade-adr.js"]
 
-  enabled_regions=[
-    "eu868",
-  ]
+  enabled_regions=["eu868"]
 
 [api]
 bind="0.0.0.0:8080"

…ation/postgresCsV4/initdb/.gitattributes …stgresChirpstackV4/initdb/.gitattributesconfiguration/postgresCsV4/initdb/.gitattributes renamed to configuration/postgresChirpstackV4/initdb/.gitattributes configuration/postgresCsV4/initdb/.gitattributes renamed to configuration/postgresChirpstackV4/initdb/.gitattributes

@@ -39,11 +39,11 @@ services:
       - ./configuration/postgresql/initdb:/docker-entrypoint-initdb.d
       - postgresqldata:/var/lib/postgresql/data
 
-  postgresCsV4:
+  postgresChirpstackV4:
     image: postgres:bookworm
     volumes:
-      - ./configuration/postgresCsV4/initdb:/docker-entrypoint-initdb.d
-      - postgresqldata:/var/lib/postgresCsV4/data
+      - ./configuration/postgresChirpstackV4/initdb:/docker-entrypoint-initdb.d
+      - postgresqldata:/var/lib/postgresChirpstackV4/data
     environment:
       - POSTGRES_PASSWORD=root
     ports: 
@@ -107,7 +107,7 @@ services:
       KAFKA_PORT: 9092
       CS_MQTT_HOSTNAME: mosquitto
       CS_MQTT_PORT: 1883
-      CHIRPSTACK_HOSTNAME: "localhost" # Change this to the chirpstack hostname
+      CHIRPSTACK_HOSTNAME: "chirpstack-svc" # Change this to the chirpstack hostname
       CHIRPSTACK_PORT: 8080
       LOG_LEVEL: debug
       EMAIL_PORT: 587

…stgresCsV4/initdb/001-init-chirpstack.sh …irpstackV4/initdb/001-init-chirpstack.shconfiguration/postgresCsV4/initdb/001-init-chirpstack.sh renamed to configuration/postgresChirpstackV4/initdb/001-init-chirpstack.sh configuration/postgresCsV4/initdb/001-init-chirpstack.sh renamed to configuration/postgresChirpstackV4/initdb/001-init-chirpstack.sh

@@ -5,19 +5,15 @@ metadata:
 data:
   chirpstack.toml: |
     [postgresql]
-    dsn="postgres://chirpstack:chirpstack@postgresCsV4/chirpstack?sslmode=disable"
+    dsn="postgres://chirpstack:chirpstack@postgresChirpstackV4/chirpstack?sslmode=disable"
 
     [redis]
-    servers=[
-      "redis://redis:6379",
-    ]
+    servers=["redis://redis:6379"]
 
     [network]
     net_id="000000"
     adr_plugins=["/etc/chirpstack/adr-modules/sensade-adr-mod/sensade-adr.js"]
-    enabled_regions=[
-      "eu868",
-    ]
+    enabled_regions=["eu868"]
 
     [api]
     bind="0.0.0.0:8080"

…CsV4/initdb/002-chirpstack_extensions.sh …ckV4/initdb/002-chirpstack_extensions.shconfiguration/postgresCsV4/initdb/002-chirpstack_extensions.sh renamed to configuration/postgresChirpstackV4/initdb/002-chirpstack_extensions.sh configuration/postgresCsV4/initdb/002-chirpstack_extensions.sh renamed to configuration/postgresChirpstackV4/initdb/002-chirpstack_extensions.sh

@@ -23,6 +23,7 @@ spec:
       labels:
         app: {{ $.Chart.Name }}
         version: "{{ $.Chart.Name }}-{{ .Values.DOCKER_IMAGE_TAG }}"
+      annotations:
         sidecar.istio.io/inject: "false"
     spec:
       containers:

docker-compose.yml

@@ -56,15 +56,15 @@ spec:
             - name: KAFKA_PORT
               value: '9092'
             - name: CHIRPSTACK_HOSTNAME
-              value: localhost
+              value: chirpstack-svc
             - name: CHIRPSTACK_PORT
               value: 8084
             - name: CS_MQTT_HOSTNAME
               value: mosquitto-svc
             - name: CS_MQTT_PORT
               value: '1883'
             - name: BACKEND_BASEURL
-              value: 'http://localhost:3000'
+              value: 'https://test-os2iot-backend.os2iot.dk'
             - name: KOMBIT_CERTIFICATEPRIVATEKEY
               value: "{{ .Values.KOMBIT_CERTIFICATEPRIVATEKEY }}"
             - name: KOMBIT_ENTRYPOINT