docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use correct paths for custom TLS CA cert and key 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-01-27 11:08:03 -05:00
parent c209704f5a
commit 371194ea8c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
host.go
View File

@ -123,8 +123,6 @@ func (h *Host) ConfigureAuth() error {
return err
}
caCertPath := filepath.Join(utils.GetMachineDir(), "ca.pem")
caKeyPath := filepath.Join(utils.GetMachineDir(), "key.pem")
serverCertPath := filepath.Join(h.storePath, "server.pem")
serverKeyPath := filepath.Join(h.storePath, "server-key.pem")
@ -133,7 +131,7 @@ func (h *Host) ConfigureAuth() error {
log.Debugf("generating server cert: %s", serverCertPath)
if err := utils.GenerateCert([]string{ip}, serverCertPath, serverKeyPath, caCertPath, caKeyPath, org, bits); err != nil {
if err := utils.GenerateCert([]string{ip}, serverCertPath, serverKeyPath, h.CaCertPath, h.PrivateKeyPath, org, bits); err != nil {
return fmt.Errorf("error generating server cert: %s", err)
}
@ -150,7 +148,7 @@ func (h *Host) ConfigureAuth() error {
}
// upload certs and configure TLS auth
caCert, err := ioutil.ReadFile(caCertPath)
caCert, err := ioutil.ReadFile(h.CaCertPath)
if err != nil {
return err
}