exp/cmd/upbox: default to EE packing

Plain is now a thing of the past.

Change-Id: Iee513236ad5c0d08a223e4f81c2acba95120496c
Reviewed-on: https://upspin-review.googlesource.com/8280
Reviewed-by: Rob Pike <r@golang.org>
Reviewed-by: Eduardo Pinheiro <epinheiro@gmail.com>
Reviewed-by: Eric Grosse <grosse@gmail.com>
diff --git a/cmd/upbox/config.go b/cmd/upbox/config.go
index 21dfc26..ae13958 100644
--- a/cmd/upbox/config.go
+++ b/cmd/upbox/config.go
@@ -113,7 +113,7 @@
 			u.Name += "@" + cfg.Domain
 		}
 		if u.Packing == "" {
-			u.Packing = "plain"
+			u.Packing = "ee"
 		}
 
 		// Add to map only after name has been normalized.
@@ -184,11 +184,11 @@
 	u := &User{Name: s.User}
 	switch s.Name {
 	case "keyserver":
-		u.Packing = "plain"
+		u.Packing = "ee"
 		u.StoreServer = "unassigned,"
 		u.DirServer = "unassigned,"
 	case "storeserver":
-		u.Packing = "plain"
+		u.Packing = "ee"
 		u.StoreServer = "inprocess,"
 		u.DirServer = "unassigned,"
 	default:
diff --git a/cmd/upbox/main.go b/cmd/upbox/main.go
index eee46cd..40893fc 100644
--- a/cmd/upbox/main.go
+++ b/cmd/upbox/main.go
@@ -41,7 +41,7 @@
 server "servername" is used.
 
 Packing specifies the packing method for this user.
-If empty, it defaults to "plain".
+If empty, it defaults to "ee".
 
 Servers
 
@@ -187,6 +187,7 @@
 
 		configContent := []string{
 			"username: " + u.Name,
+			"secrets: " + userDir(user),
 			"tlscerts: " + tmpDir,
 			"packing: " + u.Packing,
 			"storeserver: " + u.StoreServer,
@@ -196,12 +197,10 @@
 		case "keyserver":
 			configContent = append(configContent,
 				"keyserver: inprocess,",
-				"secrets: none",
 			)
 		default:
 			configContent = append(configContent,
 				"keyserver: remote,"+cfg.KeyServer,
-				"secrets: "+userDir(user),
 			)
 		}
 		configFile := filepath.Join(tmpDir, "config."+server)