diff --git a/.gitignore b/.gitignore index 9efc485..ab204f1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,7 @@ copy_files/ +presence.db +cmd/presenSe/presence.db # Dependency directories (remove the comment below to include it) # vendor/ diff --git a/cmd/presenSe/presense.go b/cmd/presenSe/presense.go index 1b197e9..8239cf7 100644 --- a/cmd/presenSe/presense.go +++ b/cmd/presenSe/presense.go @@ -48,10 +48,10 @@ func main() { Network: "tcp", Address: cfg.MQTTHost, 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 { diff --git a/internal/pkg/config/config.go b/internal/pkg/config/config.go index 9722992..f797cbf 100644 --- a/internal/pkg/config/config.go +++ b/internal/pkg/config/config.go @@ -25,8 +25,8 @@ func Load() *Config { HTTPAddr: getEnv("HTTP_HOST_PATH", "0.0.0.0:8080"), WSAddr: getEnv("HTTPWS_HOST_PATH", "0.0.0.0:8088"), 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"), DBPath: getEnv("DB_PATH", "/data/conf/presence/presence.db"), } diff --git a/internal/pkg/httpserver/server.go b/internal/pkg/httpserver/server.go index 3d1c2cf..e39c2e6 100644 --- a/internal/pkg/httpserver/server.go +++ b/internal/pkg/httpserver/server.go @@ -72,7 +72,7 @@ func StartHTTPServer(addr string, ctx *model.AppContext) { go handleMessages(ctx.Clients, &ctx.Broadcast) go func() { - log.Fatal(http.ListenAndServe(*model.HTTPWSHostPathPtr, nil)) + log.Fatal(http.ListenAndServe(addr, nil)) }() http.ListenAndServe(addr, handlers.CORS(originsOk, headersOk, methodsOk)(r))