MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-20 18:06:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move all server and controller packages into top-level

Browse Source
This commit is contained in:
Harshavardhana
2015-09-19 00:52:01 -07:00
parent d808c3685d
commit d54488f144
80 changed files with 20431 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server-main.go
View File

@@ -16,11 +16,7 @@
package main
import (
"github.com/minio/cli"
"github.com/minio/minio/pkg/server"
"github.com/minio/minio/pkg/server/api"
)
import "github.com/minio/cli"
var serverCmd = cli.Command{
Name: "server",
@@ -39,14 +35,14 @@ EXAMPLES:
`,
}
func getServerConfig(c *cli.Context) api.Config {
func getServerConfig(c *cli.Context) APIConfig {
certFile := c.GlobalString("cert")
keyFile := c.GlobalString("key")
if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") {
Fatalln("Both certificate and key are required to enable https.")
}
tls := (certFile != "" && keyFile != "")
return api.Config{
return APIConfig{
Address: c.GlobalString("address"),
TLS: tls,
CertFile: certFile,
@@ -61,6 +57,6 @@ func serverMain(c *cli.Context) {
}
apiServerConfig := getServerConfig(c)
err := server.Start(apiServerConfig)
err := StartServer(apiServerConfig)
errorIf(err.Trace(), "Failed to start the minio server.", nil)
}