From 1b4a9122b50b3589bd11b2cf94aab542ae56725c Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 15 Jan 2023 13:46:02 +0100
Subject: [PATCH] instance config: fix fallback to host-specific config

---
 cmd/breakglass/breakglass.go | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/cmd/breakglass/breakglass.go b/cmd/breakglass/breakglass.go
index 9976cf1..c3676c0 100644
--- a/cmd/breakglass/breakglass.go
+++ b/cmd/breakglass/breakglass.go
@@ -63,7 +63,11 @@ func (bg *bg) startBreakglass() error {
 		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)
 	if err != nil {
 		return err
@@ -297,7 +301,17 @@ func breakglass() error {
 		forceRestart: *forceRestart,
 		sshConfig:    *sshConfig,
 	}
+	if cfg.Update.Hostname == "" {
+		cfg.Update.Hostname = cfg.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)
 	if err := bg.startBreakglass(); err != nil {