Merge pull request #271 from bfirsh/store-certs-in-boot2docker-directory

daghack · daghack · commit 5beda7c7385a · 2014-10-13T13:34:31.000-06:00
Store certs in ~/.boot2docker/certs
diff --git a/util.go b/util.go
@@ -310,11 +310,13 @@ func RequestCertsUsingSSH(m driver.Machine) (string, error) {
 
 	b, err := cmd.Output()
 	if err == nil {
-		dir, err := cfgDir(".docker")
+		dir, err := cfgDir(".boot2docker")
 		if err != nil {
 			return "", err
 		}
 
+		certDir = filepath.Join(dir, "certs", m.GetName())
+
 		// Open the tar archive for reading.
 		r := bytes.NewReader(b)
 		tr := tar.NewReader(r)
@@ -330,7 +332,6 @@ func RequestCertsUsingSSH(m driver.Machine) (string, error) {
 				return "", err
 			}
 			filename := filepath.Base(hdr.Name)
-			certDir = filepath.Join(dir, m.GetName())
 			if err := os.MkdirAll(certDir, 0755); err != nil {
 				return "", err
 			}
