gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-25 05:27:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

refresh emqx admin user on server startup

Browse source
This commit is contained in:
Anish Mukherjee 2023-02-20 17:06:27 +05:30
parent a33ac33462
commit c7a3306d3e
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compose/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
NODE_ID: "netmaker-server-1" NODE_ID: "netmaker-server-1"
MQ_HOST: "mq" MQ_HOST: "mq"
MQ_PORT: "443" MQ_PORT: "443"
MQ_SERVER_PORT: "1883" MQ_SERVER_PORT: "8083"
STUN_PORT: "3478" STUN_PORT: "3478"
VERBOSITY: "1" VERBOSITY: "1"
MQ_PASSWORD: "REPLACE_MQ_PASSWORD" MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
@ -88,9 +88,10 @@ services:
EMQX_DASHBOARD__DEFAULT_PASSWORD: "REPLACE_MQ_PASSWORD" EMQX_DASHBOARD__DEFAULT_PASSWORD: "REPLACE_MQ_PASSWORD"
EMQX_DASHBOARD__DEFAULT_USERNAME: "REPLACE_MQ_USERNAME" EMQX_DASHBOARD__DEFAULT_USERNAME: "REPLACE_MQ_USERNAME"
ports: ports:
- "1883:1883" - "1883:1883" # MQTT
- "8883:8883" - "8883:8883" # SSL MQTT
- "18083:18083" - "8083:8083" # Websockets
- "18083:18083" # Dashboard/REST_API
volumes: volumes:
caddy_data: {} caddy_data: {}
caddy_conf: {} caddy_conf: {}

3
mq/mq.go
View file

@ -40,11 +40,12 @@ func setMqOptions(user, password string, opts *mqtt.ClientOptions) {
// SetupMQTT creates a connection to broker and return client // SetupMQTT creates a connection to broker and return client
func SetupMQTT() { func SetupMQTT() {
if servercfg.GetBrokerType() == emqxBrokerType { if servercfg.GetBrokerType() == emqxBrokerType {
time.Sleep(7 * time.Second) // wait for the REST endpoint to be ready time.Sleep(10 * time.Second) // wait for the REST endpoint to be ready
// setup authenticator and create admin user // setup authenticator and create admin user
if err := CreateEmqxDefaultAuthenticator(); err != nil { if err := CreateEmqxDefaultAuthenticator(); err != nil {
logger.Log(0, err.Error()) logger.Log(0, err.Error())
} }
DeleteEmqxUser(servercfg.GetMqUserName())
if err := CreateEmqxUser(servercfg.GetMqUserName(), servercfg.GetMqPassword(), true); err != nil { if err := CreateEmqxUser(servercfg.GetMqUserName(), servercfg.GetMqPassword(), true); err != nil {
log.Fatal(err) log.Fatal(err)
} }