From d48c0f415714a3a1c517c87b928d7ad918abd31f Mon Sep 17 00:00:00 2001
From: Evan Hazlett <ejhazlett@gmail.com>
Date: Mon, 26 Jan 2015 17:56:33 -0500
Subject: [PATCH] use server and username for certificate subject and issuer

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
---
 host.go        |  3 ++-
 main.go        |  6 +++++-
 utils/utils.go | 10 ++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/host.go b/host.go
index 17960f1b94..780d89a898 100644
--- a/host.go
+++ b/host.go
@@ -117,7 +117,8 @@ func (h *Host) ConfigureAuth() error {
 	caKeyPath := filepath.Join(utils.GetMachineDir(), "key.pem")
 	serverCertPath := filepath.Join(h.storePath, "server.pem")
 	serverKeyPath := filepath.Join(h.storePath, "server-key.pem")
-	org := "docker"
+
+	org := h.Name
 	bits := 2048
 
 	log.Debugf("generating server cert: %s", serverCertPath)
diff --git a/main.go b/main.go
index 8841748f25..93b173210d 100644
--- a/main.go
+++ b/main.go
@@ -16,7 +16,11 @@ func before(c *cli.Context) error {
 	caKeyPath := c.GlobalString("tls-ca-key")
 	clientCertPath := c.GlobalString("tls-client-cert")
 	clientKeyPath := c.GlobalString("tls-client-key")
-	org := "docker"
+
+	org, err := utils.GetUsername()
+	if err != nil {
+		return err
+	}
 	bits := 2048
 
 	if _, err := os.Stat(utils.GetMachineDir()); err != nil {
diff --git a/utils/utils.go b/utils/utils.go
index 7da3a31aa3..d58cebd25e 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"io"
 	"os"
+	"os/user"
 	"path/filepath"
 	"runtime"
 )
@@ -26,6 +27,15 @@ func GetMachineClientCertDir() string {
 	return filepath.Join(GetMachineDir(), ".client")
 }
 
+func GetUsername() (string, error) {
+	u, err := user.Current()
+	if err != nil {
+		return "", err
+	}
+
+	return u.Username, nil
+}
+
 func CopyFile(src, dst string) error {
 	in, err := os.Open(src)
 	if err != nil {