From 4bc7dc56762ef55cb873cf4bc1247076427dc845 Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Fri, 16 Jan 2015 13:54:05 -0800 Subject: [PATCH] Correct *.pem names to work with DOCKER_CERT_PATH See https://github.com/docker/docker/blob/master/docker/docker.go#L22 This is how things currently work with b2d. Signed-off-by: Nathan LeClaire --- commands.go | 4 ++-- host.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commands.go b/commands.go index c09f674fda..5374de9531 100644 --- a/commands.go +++ b/commands.go @@ -230,8 +230,8 @@ func cmdConfig(c *cli.Context) { storeDir := store.Path caCert := filepath.Join(storeDir, name, "ca.pem") - clientCert := filepath.Join(storeDir, name, "client.pem") - clientKey := filepath.Join(storeDir, name, "client-key.pem") + clientCert := filepath.Join(storeDir, name, "cert.pem") + clientKey := filepath.Join(storeDir, name, "key.pem") machineUrl, err := host.GetURL() if err != nil { log.Fatalf("Error getting machine url: %s", err) diff --git a/host.go b/host.go index 2b540a8241..e9df18ec4f 100644 --- a/host.go +++ b/host.go @@ -129,8 +129,8 @@ func (h *Host) GenerateCertificates(serverIPs []string) error { return fmt.Errorf("error generating server cert: %s", err) } - clientCertPath := filepath.Join(h.storePath, "client.pem") - clientKeyPath := filepath.Join(h.storePath, "client-key.pem") + clientCertPath := filepath.Join(h.storePath, "cert.pem") + clientKeyPath := filepath.Join(h.storePath, "key.pem") log.Debugf("generating client cert: %s", clientCertPath) if err := utils.GenerateCert([]string{""}, clientCertPath, clientKeyPath, caCertPath, privateKeyPath, org, bits); err != nil { return fmt.Errorf("error generating client cert: %s", err)