From f63986b8311a0b5cf888016eac1523b6025ebafb Mon Sep 17 00:00:00 2001 From: Rose Hogenson Date: Thu, 3 Sep 2026 22:06:52 -0700 Subject: No need for a separate mux It's a little weird that *cgi.Handler needs a circular reference. I guess it makes sense though, in case cgit uses a local redirect which I think is just when the script tells us to call it again with a different URL. --- roseh.moe.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/roseh.moe.go b/roseh.moe.go index fc61213..23c13b4 100644 --- a/roseh.moe.go +++ b/roseh.moe.go @@ -1099,18 +1099,17 @@ func main() { r.SetXForwarded() }, }}) - cgitMux := http.NewServeMux() cgitStaticFiles := http.FileServer(http.Dir(*cgit)) - cgitMux.Handle("/cgit.css", cgitStaticFiles) - cgitMux.Handle("/cgit.js", cgitStaticFiles) - cgitMux.HandleFunc("/favicon.ico", favicon) - cgitMux.Handle("/robots.txt", cgitStaticFiles) - cgitMux.Handle("/", &cgi.Handler{ - Path: filepath.Join(*cgit, "cgit.cgi"), - Env: []string{"CGIT_CONFIG=" + *cgitConfig}, - PathLocationHandler: cgitMux, - }) - http.Handle("code."+*domain+"/", cgitMux) + http.Handle("code."+*domain+"/cgit.css", cgitStaticFiles) + http.Handle("code."+*domain+"/cgit.js", cgitStaticFiles) + http.Handle("code."+*domain+"/robots.txt", cgitStaticFiles) + http.HandleFunc("code."+*domain+"/favicon.ico", favicon) + cgitCGI := &cgi.Handler{ + Path: filepath.Join(*cgit, "cgit.cgi"), + Env: []string{"CGIT_CONFIG=" + *cgitConfig}, + } + cgitCGI.PathLocationHandler = cgitCGI + http.Handle("code."+*domain+"/", cgitCGI) addr := fmt.Sprintf(":%d", *port) log.Printf("Listening on %q", addr) -- cgit v1.3.1