mike/hasshelper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Activity

Compare commits

base: mike:main
Branches Tags
mike:main
mike:mqtt
mike:tests
mike:mqtt_listen
mike:v1.0.0
mike:v0.1.0
..
compare: mike:mqtt
Branches Tags
mike:main
mike:mqtt
mike:tests
mike:mqtt_listen
mike:v1.0.0
mike:v0.1.0

No commits in common. "main" and "mqtt" have entirely different histories.
main ... mqtt

2 changed files with 9 additions and 12 deletions
Show Stats Expand all files Collapse all files

3
Makefile
View File

@ -10,9 +10,6 @@ init:
go mod download
go mod tidy
install-tools:
grep _ tools.go | awk -F'"' '{print $$2}' | xargs -tI % go install %
generate: init
go generate

18
cmd/root.go
View File

@ -9,7 +9,7 @@ import (
"os/signal"
"syscall"
// "git.bloy.org/mike/hasshelper/kiosk"
"git.bloy.org/mike/hasshelper/kiosk"
"git.bloy.org/mike/hasshelper/web"
_ "github.com/joho/godotenv/autoload"
"github.com/lmittmann/tint"
@ -54,7 +54,7 @@ func rootCmdRun(cmd *cobra.Command, args []string) {
}
}()
go web.Run(logger, exitchan, ctx)
// go kiosk.Run(logger, exitchan, ctx)
go kiosk.Run(logger, exitchan, ctx)
logger.Debug("Waiting for exit")
<-done
}
@ -105,13 +105,13 @@ func initConfig() {
"image_dir",
"version",
"webserver_port",
// "mqtt_broker_url",
// "mqtt_broker_user",
// "mqtt_broker_password",
// "mqtt_presence_topic",
// "kiosk_cmd_shell",
// "kiosk_cmd_screen_on",
// "kiosk_cmd_screen_off",
"mqtt_broker_url",
"mqtt_broker_user",
"mqtt_broker_password",
"mqtt_presence_topic",
"kiosk_cmd_shell",
"kiosk_cmd_screen_on",
"kiosk_cmd_screen_off",
}
for _, key := range expected_config {
if !viper.IsSet(key) {