MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable TLS and use it

This commit is contained in:
Harshavardhana 2015-06-08 20:10:59 -07:00
parent dcc1609d2e
commit c6ecd94420
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main.go
View File

@ -39,13 +39,12 @@ var flags = []cli.Flag{
Value: ":9000", Value: ":9000",
Usage: "ADDRESS:PORT for object storage access", Usage: "ADDRESS:PORT for object storage access",
}, },
/* cli.StringFlag{
cli.StringFlag{ Name: "address-mgmt",
Name: "address-mgmt", Hide: true,
Value: ":9001", Value: ":9001",
Usage: "ADDRESS:PORT for management console access", Usage: "ADDRESS:PORT for management console access",
}, },
*/
cli.IntFlag{ cli.IntFlag{
Name: "ratelimit", Name: "ratelimit",
Value: 16, Value: 16,
@ -53,15 +52,11 @@ var flags = []cli.Flag{
}, },
cli.StringFlag{ cli.StringFlag{
Name: "cert", Name: "cert",
Hide: true, Usage: "Provide your domain certificate",
Value: "",
Usage: "cert.pem",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "key", Name: "key",
Hide: true, Usage: "Provide your domain private key",
Value: "",
Usage: "key.pem",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "debug", Name: "debug",
@ -78,8 +73,8 @@ func init() {
} }
func getAPIServerConfig(c *cli.Context) httpserver.Config { func getAPIServerConfig(c *cli.Context) httpserver.Config {
certFile := c.String("cert") certFile := c.GlobalString("cert")
keyFile := c.String("key") keyFile := c.GlobalString("key")
if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") { if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") {
Fatalln("Both certificate and key are required to enable https.") Fatalln("Both certificate and key are required to enable https.")
} }

5
pkg/server/httpserver/httpserver.go
View File

@ -74,7 +74,6 @@ func start(ctrlChannel <-chan string, errorChannel chan<- error,
} }
} }
} }
switch { switch {
default: default:
for _, host := range hosts { for _, host := range hosts {
@ -82,7 +81,9 @@ func start(ctrlChannel <-chan string, errorChannel chan<- error,
} }
err = httpServer.ListenAndServe() err = httpServer.ListenAndServe()
case config.TLS == true: case config.TLS == true:
fmt.Printf("Starting minio server on: https://%s:%s\n", host, port) for _, host := range hosts {
fmt.Printf("Starting minio server on: https://%s:%s\n", host, port)
}
httpServer.TLSConfig = getDefaultTLSConfig() httpServer.TLSConfig = getDefaultTLSConfig()
err = httpServer.ListenAndServeTLS(config.CertFile, config.KeyFile) err = httpServer.ListenAndServeTLS(config.CertFile, config.KeyFile)
} }