Fix SSL support, pointer indirection caused nil buffers

master
Harshavardhana 10 years ago
parent f737c0540e
commit 2413a110e6
  1. 1
      .gitattributes
  2. 2
      Dockerfile
  3. 10
      pkg/server/server.go

1
.gitattributes vendored

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

@ -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"]

@ -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)
} }

Loading…
Cancel
Save