From 0e77cde9c07fe9cdda30f7a95ff96b3ebe9e5caf Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Wed, 18 Mar 2015 05:41:03 -0700
Subject: [PATCH] Store server specific secrets in a separate file

TLS certs and SSH cert are stored in the rancher-private.yml file
---
 config/disk.go | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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