lordwelch/breakglass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

instance config: fix fallback to host-specific config

Browse Source
This commit is contained in:
Michael Stapelberg 2023-01-15 13:46:02 +01:00
parent 994987ee06
commit 1b4a9122b5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/breakglass/breakglass.go
View File

@ -63,7 +63,11 @@ func (bg *bg) startBreakglass() error {
bg.cfg.Update.HTTPSPort = "443" bg.cfg.Update.HTTPSPort = "443"
} }
update := bg.cfg.Update update, err := bg.cfg.Update.WithFallbackToHostSpecific(bg.cfg.Update.Hostname)
if err != nil {
return err
}
updateBaseUrl, err := updateflag.BaseURL(update.HTTPPort, schema, update.Hostname, update.HTTPPassword) updateBaseUrl, err := updateflag.BaseURL(update.HTTPPort, schema, update.Hostname, update.HTTPPassword)
if err != nil { if err != nil {
return err return err
@ -297,7 +301,17 @@ func breakglass() error {
forceRestart: *forceRestart, forceRestart: *forceRestart,
sshConfig: *sshConfig, sshConfig: *sshConfig,
} }
if cfg.Update.Hostname == "" {
cfg.Update.Hostname = cfg.Hostname
}
hostname := cfg.Update.Hostname hostname := cfg.Update.Hostname
if cfg.Update.HTTPPassword == "" {
pwb, err := config.HostnameSpecific(hostname).ReadFile("http-password.txt")
if err != nil {
return err
}
cfg.Update.HTTPPassword = pwb
}
log.Printf("checking breakglass status on gokrazy instance %q", bg.cfg.Hostname) log.Printf("checking breakglass status on gokrazy instance %q", bg.cfg.Hostname)
if err := bg.startBreakglass(); err != nil { if err := bg.startBreakglass(); err != nil {