rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-03 07:44:21 +00:00
Code Issues Releases Wiki Activity

Default dirs for TLS cert generation

Browse Source 
/etc/docker/tls - for server
/home/rancher/.docker - for client
This commit is contained in:
Ivan Mikushin
2015-12-10 14:24:14 +05:00
parent 6b7ddfaff2
commit 3e44413aa9
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/control/tlsconf.go
View File

@@ -1,7 +1,6 @@
package control package control
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@@ -157,7 +156,12 @@ func Generate(generateServer bool, outDir string, hostnames []string) error {
} }
if outDir == "" { if outDir == "" {
return fmt.Errorf("out directory (-d, --dir) not specified") if generateServer {
outDir = "/etc/docker/tls"
} else {
outDir = "/home/rancher/.docker"
}
log.Infof("Out directory (-d, --dir) not specified, using default: %s", outDir)
} }
caCertPath := filepath.Join(outDir, "ca.pem") caCertPath := filepath.Join(outDir, "ca.pem")
caKeyPath := filepath.Join(outDir, "ca-key.pem") caKeyPath := filepath.Join(outDir, "ca-key.pem")
@@ -179,6 +183,17 @@ func Generate(generateServer bool, outDir string, hostnames []string) error {
if err != nil { if err != nil {
return err return err
} }
if err := writeCerts(generateServer, hostnames, cfg, certPath, keyPath, caCertPath, caKeyPath); err != nil {
return err
}
return writeCerts(generateServer, hostnames, cfg, certPath, keyPath, caCertPath, caKeyPath) if !generateServer {
if err := filepath.Walk(outDir, func(path string, info os.FileInfo, err error) error {
return os.Chown(path, 1100, 1100) // rancher:rancher
}); err != nil {
return err
}
}
return nil
} }