From 57988269902f48066bfb795902dabb0096e85916 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Thu, 4 Jun 2020 08:19:30 -0700
Subject: [PATCH] cmd/derper: add /home/bradfitz/keys to default mesh key
 search list

---
 cmd/derper/derper.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cmd/derper/derper.go b/cmd/derper/derper.go
index 955c9dbfb..de63482fb 100644
--- a/cmd/derper/derper.go
+++ b/cmd/derper/derper.go
@@ -299,9 +299,14 @@ func prodAutocertHostPolicy(_ context.Context, host string) error {
 }
 
 func defaultMeshPSKFile() string {
-	const def = "/home/derp/keys/derp-mesh.key"
-	if _, err := os.Stat(def); err == nil {
-		return def
+	try := []string{
+		"/home/derp/keys/derp-mesh.key",
+		filepath.Join(os.Getenv("HOME"), "keys", "derp-mesh.key"),
+	}
+	for _, p := range try {
+		if _, err := os.Stat(p); err == nil {
+			return p
+		}
 	}
 	return ""
 }