From 121298af0e2d9749c1f235266e468c308f3fe7e2 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 17 Nov 2015 13:36:34 -0800 Subject: [PATCH] Add LE support, listen on HTTPS and HTTP --- .../cmd/ffzsocketserver/socketserver.go | 20 +++++++++---------- socketserver/server/handlecore.go | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/socketserver/cmd/ffzsocketserver/socketserver.go b/socketserver/cmd/ffzsocketserver/socketserver.go index 47da3871..5432f3a3 100644 --- a/socketserver/cmd/ffzsocketserver/socketserver.go +++ b/socketserver/cmd/ffzsocketserver/socketserver.go @@ -47,25 +47,25 @@ func main() { Addr: conf.ListenAddr, } - logFile, err := os.OpenFile("output.log", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644) - if err != nil { - log.Fatal("Could not create logfile: ", err) - } + // logFile, err := os.OpenFile("output.log", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644) + // if err != nil { + // log.Fatal("Could not create logfile: ", err) + // } server.SetupServerAndHandle(conf, nil) server.SetBuildStamp(BuildTime, BuildHash) go commandLineConsole() - log.SetOutput(logFile) - if conf.UseSSL { - err = httpServer.ListenAndServeTLS(conf.SSLCertificateFile, conf.SSLKeyFile) - } else { - err = httpServer.ListenAndServe() + go func() { + if err := httpServer.ListenAndServeTLS(conf.SSLCertificateFile, conf.SSLKeyFile); err != nil { + log.Fatal("ListenAndServeTLS: ", err) + } + }() } - if err != nil { + if err = httpServer.ListenAndServe(); err != nil { log.Fatal("ListenAndServe: ", err) } } diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index dad4de2b..78329241 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -70,6 +70,7 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) { serveMux.HandleFunc("/", HTTPHandleRootURL) serveMux.HandleFunc("/stats", HTTPShowStatistics) + serveMux.Handle("/.well-known", http.FileServer(http.FileSystem(http.Dir("/tmp/letsencrypt/.well-known")))) serveMux.HandleFunc("/drop_backlog", HTTPBackendDropBacklog) serveMux.HandleFunc("/uncached_pub", HTTPBackendUncachedPublish)