From 933640538dcf26711d5b0dc2d9084bb6c6e3ca2d Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sun, 2 Jun 2024 14:00:12 -0700 Subject: [PATCH] internal/packer: use new UpdateOpts.NoPassword Updates gokrazy/gokrazy#265 Updates tailscale/tailscale#1866 Signed-off-by: Brad Fitzpatrick --- internal/packer/packer.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/packer/packer.go b/internal/packer/packer.go index 5fb6dc2..626ef21 100644 --- a/internal/packer/packer.go +++ b/internal/packer/packer.go @@ -1242,7 +1242,7 @@ func (pack *Pack) logic(programName string) error { update.Hostname = updateHostname } - if update.HTTPPassword == "" { + if update.HTTPPassword == "" && !update.NoPassword { pw, err := ensurePasswordFileExists(updateHostname, defaultPassword) if err != nil { return err @@ -1374,11 +1374,13 @@ func (pack *Pack) logic(programName string) error { etc.Dirents = append(etc.Dirents, ssl) - etc.Dirents = append(etc.Dirents, &FileInfo{ - Filename: "gokr-pw.txt", - Mode: 0400, - FromLiteral: update.HTTPPassword, - }) + if !update.NoPassword { + etc.Dirents = append(etc.Dirents, &FileInfo{ + Filename: "gokr-pw.txt", + Mode: 0400, + FromLiteral: update.HTTPPassword, + }) + } etc.Dirents = append(etc.Dirents, &FileInfo{ Filename: "http-port.txt",