Merge branch 'Martin' into 'mqttTest'

Working on broker

See merge request !58

api/docker-compose.yml

@@ -6,8 +6,9 @@ services:
     ports:
       - ${MQTT_PORT}:1883
     volumes:
-      - ./broker/mosquitto.conf:/mosquitto/config/mosquitto.conf
-      - ./broker/mosquitto.passwd:/mosquitto/config/mosquitto.passwd
+      - ./mqtt/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - ./mqtt/mosquitto.passwd:/mosquitto/config/mosquitto.passwd
+    restart: always
 
   web:
     container_name: go

api/mqtt/mqttBroker.go

@@ -59,8 +59,8 @@ func InitializeMQTTClient() {
 	opts := mqtt.NewClientOptions()
 	opts.AddBroker(fmt.Sprintf("tcp://%s:%d", broker, port))
 	opts.SetClientID("BLE-Parser")
-	opts.SetUsername("admin")
-	opts.SetPassword("admin")
+	opts.SetUsername("stillasTracker")
+	opts.SetPassword("stillasTracker")
 	opts.OnConnect = connectHandler
 	opts.OnConnectionLost = connectLostHandler
 	client := mqtt.NewClient(opts)