mirrors/redoctober
1
0
Fork 0
mirror of https://github.com/cloudflare/redoctober.git synced 2026-01-06 05:27:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #113 from cloudflare/jkroll/listen-tls

Browse Source 
Modify the way we listen on TLS
This commit is contained in:
Zi Lin
2015-12-04 15:12:26 -08:00
parent eb38e1afe3 d9e9f26d8d
commit 9e54751efc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
redoctober.go
View File

@@ -84,7 +84,7 @@ func queueRequest(process chan<- userRequest, requestType string, w http.Respons
//
// Returns a valid http.Server handling redoctober JSON requests (and
// its associated listener) or an error
func NewServer(process chan<- userRequest, staticPath, addr, caPath string, certPaths, keyPaths []string, useSystemdSocket bool) (*http.Server, *net.Listener, error) {
func NewServer(process chan<- userRequest, staticPath, addr, caPath string, certPaths, keyPaths []string, useSystemdSocket bool) (*http.Server, net.Listener, error) {
config := &tls.Config{
PreferServerCipherSuites: true,
SessionTicketsDisabled: true,
@@ -161,11 +161,12 @@ func NewServer(process chan<- userRequest, staticPath, addr, caPath string, cert
mux.HandleFunc("/", idxHandler.handle)
srv := http.Server{
Addr: addr,
Handler: mux,
Addr: addr,
Handler: mux,
TLSConfig: config,
}
return &srv, &lstnr, nil
return &srv, lstnr, nil
}
type indexHandler struct {
@@ -268,7 +269,7 @@ func main() {
if err != nil {
log.Fatalf("Error starting redoctober server: %s\n", err)
}
s.Serve(*l)
s.Serve(l)
}
var indexHtml = []byte(`<!DOCTYPE html>