From 2c83dac5d47195b7589a9e879598d00c00f1b302 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 10 Dec 2019 12:23:26 +0000 Subject: FCGI: Allow FCGI over unix sockets (#9298) * FCGI: Allow FCGI over unix sockets * fixup! FCGI: Allow FCGI over unix sockets --- cmd/web.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cmd/web.go') diff --git a/cmd/web.go b/cmd/web.go index e0e47a181f..cc00a32198 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -122,6 +122,7 @@ func runWeb(ctx *cli.Context) error { switch setting.Protocol { case setting.UnixSocket: case setting.FCGI: + case setting.FCGIUnix: default: // Save LOCAL_ROOT_URL if port changed cfg := ini.Empty() @@ -149,7 +150,7 @@ func runWeb(ctx *cli.Context) error { } listenAddr := setting.HTTPAddr - if setting.Protocol != setting.UnixSocket { + if setting.Protocol != setting.UnixSocket && setting.Protocol != setting.FCGIUnix { listenAddr += ":" + setting.HTTPPort } log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubURL) @@ -183,10 +184,13 @@ func runWeb(ctx *cli.Context) error { err = runHTTPS("tcp", listenAddr, setting.CertFile, setting.KeyFile, context2.ClearHandler(m)) case setting.FCGI: NoHTTPRedirector() - err = runFCGI(listenAddr, context2.ClearHandler(m)) + err = runFCGI("tcp", listenAddr, context2.ClearHandler(m)) case setting.UnixSocket: NoHTTPRedirector() err = runHTTP("unix", listenAddr, context2.ClearHandler(m)) + case setting.FCGIUnix: + NoHTTPRedirector() + err = runFCGI("unix", listenAddr, context2.ClearHandler(m)) default: log.Fatal("Invalid protocol: %s", setting.Protocol) } -- cgit v1.2.3