docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge pull request #1 from nathanleclaire/ehazlett-standard-tls

Browse Source 
Correct *.pem names to work with DOCKER_CERT_PATH
This commit is contained in:
Evan Hazlett
2015-01-16 16:59:45 -05:00
parent 0c8ef0abe5 4bc7dc5676
commit e6de563d62
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands.go
View File

@@ -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)

4
host.go
View File

@@ -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)