Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 02218dfa1a | |||
| 7036096118 |
3
Makefile
3
Makefile
@ -10,6 +10,9 @@ 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
18
cmd/root.go
@ -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) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user