1
0
mirror of https://github.com/rancher/os.git synced 2025-07-02 01:31:48 +00:00

Store server specific secrets in a separate file

TLS certs and SSH cert are stored in the rancher-private.yml file
This commit is contained in:
Darren Shepherd 2015-03-18 05:41:03 -07:00
parent b351efa111
commit 0e77cde9c0

View File

@ -24,21 +24,23 @@ func saveToDisk(data map[interface{}]interface{}) error {
for k, v := range data { for k, v := range data {
if k == "ssh" { if k == "ssh" {
private[k] = v private[k] = v
} else if k == "userdocker" { } else if k == "user_docker" {
var userDockerConfig UserDockerConfig var userDockerConfig DockerConfig
var userDockerConfigPrivate UserDockerConfig var userDockerConfigPrivate DockerConfig
err := util.Convert(v, &userDockerConfig) err := util.Convert(v, &userDockerConfig)
if err != nil { if err != nil {
return err return err
} }
userDockerConfigPrivate.TLSCACert = userDockerConfig.TLSCACert userDockerConfigPrivate.CAKey = userDockerConfig.CAKey
userDockerConfigPrivate.TLSServerKey = userDockerConfig.TLSServerKey userDockerConfigPrivate.CACert = userDockerConfig.CACert
userDockerConfigPrivate.TLSServerCert = userDockerConfig.TLSServerCert userDockerConfigPrivate.ServerKey = userDockerConfig.ServerKey
userDockerConfigPrivate.ServerCert = userDockerConfig.ServerCert
userDockerConfig.TLSCACert = "" userDockerConfig.CAKey = ""
userDockerConfig.TLSServerKey = "" userDockerConfig.CACert = ""
userDockerConfig.TLSServerCert = "" userDockerConfig.ServerKey = ""
userDockerConfig.ServerCert = ""
config[k] = userDockerConfig config[k] = userDockerConfig
private[k] = userDockerConfigPrivate private[k] = userDockerConfigPrivate