MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-02-26 12:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #719 from harshavardhana/pr_out_fix_ssl_support_pointer_indirection_caused_nil_buffers

Browse Source
This commit is contained in:
Harshavardhana 2015-07-08 18:04:26 +00:00
commit b71f15d32d
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1 +0,0 @@
main.go ident

2
Dockerfile
View File

@ -31,4 +31,4 @@ RUN apt-get remove -y build-essential curl git && \
EXPOSE 9000 9001 EXPOSE 9000 9001
CMD ["sh", "-c", "${GOPATH}/bin/minio mode memory 2G"] CMD ["sh", "-c", "${GOPATH}/bin/minio server"]

10
pkg/server/server.go
View File

@ -39,14 +39,10 @@ func getAPIServer(conf api.Config, apiHandler http.Handler) (*http.Server, error
} }
if conf.TLS { if conf.TLS {
config := &tls.Config{}
if httpServer.TLSConfig != nil {
*config = *httpServer.TLSConfig
}
var err error var err error
config.Certificates = make([]tls.Certificate, 1) httpServer.TLSConfig = &tls.Config{}
config.Certificates[0], err = tls.LoadX509KeyPair(conf.CertFile, conf.KeyFile) httpServer.TLSConfig.Certificates = make([]tls.Certificate, 1)
httpServer.TLSConfig.Certificates[0], err = tls.LoadX509KeyPair(conf.CertFile, conf.KeyFile)
if err != nil { if err != nil {
return nil, iodine.New(err, nil) return nil, iodine.New(err, nil)
} }