| @@ -19,5 +19,7 @@ | |||||
| copy_files/ | copy_files/ | ||||
| presence.db | |||||
| cmd/presenSe/presence.db | |||||
| # Dependency directories (remove the comment below to include it) | # Dependency directories (remove the comment below to include it) | ||||
| # vendor/ | # vendor/ | ||||
| @@ -48,10 +48,10 @@ func main() { | |||||
| Network: "tcp", | Network: "tcp", | ||||
| Address: cfg.MQTTHost, | Address: cfg.MQTTHost, | ||||
| ClientID: []byte(cfg.MQTTClientID), | ClientID: []byte(cfg.MQTTClientID), | ||||
| UserName: nil, | |||||
| Password: nil, | |||||
| // UserName: []byte(cfg.MQTTUser), | |||||
| // Password: []byte(cfg.MQTTPass), | |||||
| // UserName: nil, | |||||
| // Password: nil, | |||||
| UserName: []byte(cfg.MQTTUser), | |||||
| Password: []byte(cfg.MQTTPass), | |||||
| }) | }) | ||||
| if err != nil { | if err != nil { | ||||
| @@ -25,8 +25,8 @@ func Load() *Config { | |||||
| HTTPAddr: getEnv("HTTP_HOST_PATH", "0.0.0.0:8080"), | HTTPAddr: getEnv("HTTP_HOST_PATH", "0.0.0.0:8080"), | ||||
| WSAddr: getEnv("HTTPWS_HOST_PATH", "0.0.0.0:8088"), | WSAddr: getEnv("HTTPWS_HOST_PATH", "0.0.0.0:8088"), | ||||
| MQTTHost: getEnv("MQTT_HOST", "localhost:1883"), | MQTTHost: getEnv("MQTT_HOST", "localhost:1883"), | ||||
| MQTTUser: getEnv("MQTT_USERNAME", "none"), | |||||
| MQTTPass: getEnv("MQTT_PASSWORD", "none"), | |||||
| MQTTUser: getEnv("MQTT_USERNAME", "chesnek"), | |||||
| MQTTPass: getEnv("MQTT_PASSWORD", "chesnek"), | |||||
| MQTTClientID: getEnv("MQTT_CLIENT_ID", "presence-detector"), | MQTTClientID: getEnv("MQTT_CLIENT_ID", "presence-detector"), | ||||
| DBPath: getEnv("DB_PATH", "/data/conf/presence/presence.db"), | DBPath: getEnv("DB_PATH", "/data/conf/presence/presence.db"), | ||||
| } | } | ||||
| @@ -72,7 +72,7 @@ func StartHTTPServer(addr string, ctx *model.AppContext) { | |||||
| go handleMessages(ctx.Clients, &ctx.Broadcast) | go handleMessages(ctx.Clients, &ctx.Broadcast) | ||||
| go func() { | go func() { | ||||
| log.Fatal(http.ListenAndServe(*model.HTTPWSHostPathPtr, nil)) | |||||
| log.Fatal(http.ListenAndServe(addr, nil)) | |||||
| }() | }() | ||||
| http.ListenAndServe(addr, handlers.CORS(originsOk, headersOk, methodsOk)(r)) | http.ListenAndServe(addr, handlers.CORS(originsOk, headersOk, methodsOk)(r)) | ||||