diff options
| author | Russ Cox <rsc@golang.org> | 2021-11-09 23:00:06 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2021-11-17 17:48:38 +0000 |
| commit | 7008ea24bd9b9f2483af110851f71fb8d2a9b06e (patch) | |
| tree | 9e5c0f499fea8d208cd120b4ae22febaaf3d1f49 /cmd/golangorg/server.go | |
| parent | 9d9bbfb1e70f925bf1809caa2d8ba56e3639d5a5 (diff) | |
| download | go-x-website-7008ea24bd9b9f2483af110851f71fb8d2a9b06e.tar.xz | |
cmd/golangorg: refactor go.dev setup to make golang.org merge easier
No semantic changes here, just replacing the godevHandler
function with the same site setup that golang.org already uses.
Change-Id: Id25cf3ce98cc8bea7da4e2b367a05b648a270522
Reviewed-on: https://go-review.googlesource.com/c/website/+/362955
Trust: Russ Cox <rsc@golang.org>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
Diffstat (limited to 'cmd/golangorg/server.go')
| -rw-r--r-- | cmd/golangorg/server.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cmd/golangorg/server.go b/cmd/golangorg/server.go index e79e9db8..5dfe069b 100644 --- a/cmd/golangorg/server.go +++ b/cmd/golangorg/server.go @@ -34,6 +34,7 @@ import ( "golang.org/x/tools/playground" "golang.org/x/website" "golang.org/x/website/internal/backport/html/template" + "golang.org/x/website/internal/blog" "golang.org/x/website/internal/codewalk" "golang.org/x/website/internal/dl" "golang.org/x/website/internal/gitfs" @@ -197,11 +198,16 @@ func NewHandler(contentDir, goroot string) http.Handler { // (golang.org/dl and golang.google.cn/dl are registered separately.) mux.Handle("tip.golang.org/dl/", http.RedirectHandler("https://golang.org/dl/", http.StatusFound)) - godev, err := godevHandler(godevFS) + godevMux := http.NewServeMux() + godevSite, err := newSite(godevMux, "go.dev", godevFS, gorootFS) if err != nil { - log.Fatalf("godevHandler: %v", err) + log.Fatalf("newSite go.dev: %v", err) } - mux.Handle("go.dev/", godev) + godevMux.Handle("/explore/", http.StripPrefix("/explore/", redirectPrefix("https://pkg.go.dev/"))) + if err := blog.RegisterFeeds(godevMux, "", godevSite); err != nil { + log.Fatalf("blog: %v", err) + } + mux.Handle("go.dev/", addCSP(godevMux)) mux.Handle("blog.golang.org/", redirectPrefix("https://go.dev/blog/")) mux.Handle("learn.go.dev/", redirectPrefix("https://go.dev/learn/")) @@ -227,7 +233,9 @@ func newSite(mux *http.ServeMux, host string, content, goroot fs.FS) (*web.Site, site.Funcs(template.FuncMap{ "googleAnalytics": func() string { return googleAnalytics }, "googleCN": func() bool { return host == "golang.google.cn" }, + "newest": newest, "releases": func() []*history.Major { return history.Majors }, + "section": section, "version": func() string { return runtime.Version() }, }) docs, err := pkgdoc.NewServer(fsys, site, googleCN) |