rename MQ_HOST -> BROKER_ENDPOINT

compose/docker-compose-emqx.yml

@@ -25,7 +25,7 @@ services:
       DISPLAY_KEYS: "on"
       DATABASE: "sqlite"
       NODE_ID: "netmaker-server-1"
-      MQ_HOST: "ws://mq:8083/mqtt"
+      BROKER_ENDPOINT: "ws://mq:8083/mqtt"
       MQ_PORT: "443"      
       STUN_PORT: "3478"      
       VERBOSITY: "1"

compose/docker-compose.ee.yml

@@ -25,7 +25,7 @@ services:
       DISPLAY_KEYS: "on"
       DATABASE: "sqlite"
       NODE_ID: "netmaker-server-1"
-      MQ_HOST: "ws://mq:8083/mqtt"
+      BROKER_ENDPOINT: "ws://mq:8083/mqtt"
       MQ_PORT: "443"
       MQ_USERNAME: "REPLACE_MQ_USERNAME"
       MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
@@ -112,7 +112,7 @@ services:
     depends_on:
       - netmaker
     environment:
-      MQ_HOST: "mq"
+      BROKER_ENDPOINT: "mq"
       MQ_PORT: "443"
       MQ_SERVER_PORT: "1883"
       PROMETHEUS: "on"

compose/docker-compose.reference.yml

@@ -26,7 +26,7 @@ services:
       DISPLAY_KEYS: "on" # Show keys permanently in UI (until deleted) as opposed to 1-time display.
       DATABASE: "sqlite" # Database to use - sqlite, postgres, or rqlite
       NODE_ID: "netmaker-server-1" # used for HA - identifies this server vs other servers
-      MQ_HOST: ""ws://mq:1883""  # the address of the mq server. If running from docker compose it will be "mq". Otherwise, need to input address. If using "host networking", it will find and detect the IP of the mq container.
+      BROKER_ENDPOINT: ""ws://mq:1883""  # the address of the mq server. If running from docker compose it will be "mq". Otherwise, need to input address. If using "host networking", it will find and detect the IP of the mq container.
       MQ_PORT: "443" # the reachable port of MQ - change if external MQ port changes (port on proxy, not necessarily the one exposed in docker-compose)
       MQ_USERNAME: "REPLACE_MQ_USERNAME" # the username to set for MQ access
       MQ_PASSWORD: "REPLACE_MQ_PASSWORD" # the password to set for MQ access

compose/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       DISPLAY_KEYS: "on"
       DATABASE: "sqlite"
       NODE_ID: "netmaker-server-1"
-      MQ_HOST: "ws://mq:1883"
+      BROKER_ENDPOINT: "ws://mq:1883"
       MQ_PORT: "443"      
       STUN_PORT: "3478"      
       VERBOSITY: "1"

servercfg/serverconf.go

@@ -241,8 +241,8 @@ func GetMQPort() string {
 // GetMessageQueueEndpoint - gets the message queue endpoint
 func GetMessageQueueEndpoint() (string, bool) {
 	host, _ := GetPublicIP()
-	if os.Getenv("MQ_HOST") != "" {
-		host = os.Getenv("MQ_HOST")
+	if os.Getenv("BROKER_ENDPOINT") != "" {
+		host = os.Getenv("BROKER_ENDPOINT")
 	} else if config.Config.Server.MQHOST != "" {
 		host = config.Config.Server.MQHOST
 	} else {