Merge branch 'pr-amery-wg-auto-init' into next-amery

2023-10-28 15:59:50 +00:00
parent 634941a1ef e5639b2f4e
commit d4bee2f14b
5 changed files with 63 additions and 13 deletions
@@ -180,10 +180,12 @@ func (p interfaceConfig) Export() (InterfaceConfig, error) {
 		ListenPort: p.ListenPort,
 	}

-	out.PrivateKey, err = PrivateKeyFromBase64(p.PrivateKey)
-	if err != nil {
-		err = core.Wrap(err, "PrivateKey")
-		return InterfaceConfig{}, err
+	if p.PrivateKey != "" {
+		out.PrivateKey, err = PrivateKeyFromBase64(p.PrivateKey)
+		if err != nil {
+			err = core.Wrap(err, "PrivateKey")
+			return InterfaceConfig{}, err
+		}
 	}

 	return out, nil