From bbc32d6ac01c4996959ca802addf86ea3619f143 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Thu, 30 Apr 2015 21:15:53 -0700
Subject: [PATCH] Disable domain based routing for now

---
 main.go                             | 14 +++++++-------
 pkg/api/api_router.go               |  8 +++++---
 pkg/server/httpserver/httpserver.go |  2 +-
 pkg/server/server.go                |  5 +++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/main.go b/main.go
index 837f12d1a..5e129f76b 100644
--- a/main.go
+++ b/main.go
@@ -93,11 +93,11 @@ EXAMPLES:
 }
 
 var flags = []cli.Flag{
-	cli.StringFlag{
-		Name:  "domain",
-		Value: "",
-		Usage: "domain used for routing incoming API requests",
-	},
+	//	cli.StringFlag{
+	//		Name:  "domain",
+	//		Value: "",
+	//		Usage: "domain used for routing incoming API requests",
+	//	},
 	cli.StringFlag{
 		Name:  "api-address",
 		Value: ":9000",
@@ -191,7 +191,7 @@ func getAPIServerConfig(c *cli.Context) httpserver.Config {
 	}
 	tls := (certFile != "" && keyFile != "")
 	return httpserver.Config{
-		Domain:   c.GlobalString("domain"),
+		//		Domain:   c.GlobalString("domain"),
 		Address:  c.GlobalString("api-address"),
 		TLS:      tls,
 		CertFile: certFile,
@@ -201,7 +201,7 @@ func getAPIServerConfig(c *cli.Context) httpserver.Config {
 
 func getWebServerConfigFunc(c *cli.Context) server.StartServerFunc {
 	config := httpserver.Config{
-		Domain:   c.GlobalString("domain"),
+		//		Domain:   c.GlobalString("domain"),
 		Address:  c.GlobalString("web-address"),
 		TLS:      false,
 		CertFile: "",
diff --git a/pkg/api/api_router.go b/pkg/api/api_router.go
index 65ccd500c..2ab8721e8 100644
--- a/pkg/api/api_router.go
+++ b/pkg/api/api_router.go
@@ -47,6 +47,7 @@ func pathMux(api minioAPI, mux *router.Router) *router.Router {
 	return mux
 }
 
+/*
 // Domain based routing
 func domainMux(api minioAPI, mux *router.Router) *router.Router {
 	mux.HandleFunc("/",
@@ -63,15 +64,16 @@ func domainMux(api minioAPI, mux *router.Router) *router.Router {
 
 	return mux
 }
+*/
 
 // Get proper router based on domain availability
 func getMux(api minioAPI, mux *router.Router) *router.Router {
 	switch true {
 	case api.domain == "":
 		return pathMux(api, mux)
-	case api.domain != "":
-		s := mux.Host(api.domain).Subrouter()
-		return domainMux(api, s)
+		//	case api.domain != "":
+		//		s := mux.Host(api.domain).Subrouter()
+		//		return domainMux(api, s)
 	}
 	return nil
 }
diff --git a/pkg/server/httpserver/httpserver.go b/pkg/server/httpserver/httpserver.go
index 8abe9de49..0570789cd 100644
--- a/pkg/server/httpserver/httpserver.go
+++ b/pkg/server/httpserver/httpserver.go
@@ -29,7 +29,7 @@ type Config struct {
 	CertFile  string
 	KeyFile   string
 	Websocket bool // TODO
-	Domain    string
+	//	Domain    string
 }
 
 // Server - http server related
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 3efbbded8..008360ec6 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -41,7 +41,8 @@ type MemoryFactory struct {
 func (f MemoryFactory) GetStartServerFunc() StartServerFunc {
 	return func() (chan<- string, <-chan error) {
 		_, _, driver := memory.Start(f.MaxMemory, 1*time.Hour)
-		ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config)
+		//ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config)
+		ctrl, status, _ := httpserver.Start(api.HTTPHandler("", driver), f.Config)
 		return ctrl, status
 	}
 }
@@ -69,7 +70,7 @@ type DonutFactory struct {
 func (f DonutFactory) GetStartServerFunc() StartServerFunc {
 	return func() (chan<- string, <-chan error) {
 		_, _, driver := donut.Start(f.Paths)
-		ctrl, status, _ := httpserver.Start(api.HTTPHandler(f.Domain, driver), f.Config)
+		ctrl, status, _ := httpserver.Start(api.HTTPHandler("", driver), f.Config)
 		return ctrl, status
 	}
 }