diff options
| author | Russ Cox <rsc@golang.org> | 2021-11-18 12:14:55 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2021-11-22 20:36:15 +0000 |
| commit | c01d5558942054afd231d096aba71896c9990785 (patch) | |
| tree | 0fe0023473b29a387d9264696eaf231e98e11e1d /cmd/golangorg/server.go | |
| parent | e219555f0be92c3e4ac359cb6d74608fe38a8117 (diff) | |
| download | go-x-website-c01d5558942054afd231d096aba71896c9990785.tar.xz | |
talks: serve go.dev/talks for talks.golang.org content
This is the last user-facing golang.org domain.
Now everything is on go.dev.
Change-Id: I8d9f4b7609a019f077848825cbd417d38058a5ac
Reviewed-on: https://go-review.googlesource.com/c/website/+/365494
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
Diffstat (limited to 'cmd/golangorg/server.go')
| -rw-r--r-- | cmd/golangorg/server.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmd/golangorg/server.go b/cmd/golangorg/server.go index de5c0a4d..5b0a6881 100644 --- a/cmd/golangorg/server.go +++ b/cmd/golangorg/server.go @@ -43,6 +43,7 @@ import ( "golang.org/x/website/internal/proxy" "golang.org/x/website/internal/redirect" "golang.org/x/website/internal/short" + "golang.org/x/website/internal/talks" "golang.org/x/website/internal/tour" "golang.org/x/website/internal/web" "golang.org/x/website/internal/webtest" @@ -172,6 +173,7 @@ func NewHandler(contentDir, goroot string) http.Handler { mux.Handle("golang.org/", redirectPrefix("https://go.dev/")) mux.Handle("blog.golang.org/", redirectPrefix("https://go.dev/blog/")) mux.Handle("learn.go.dev/", redirectPrefix("https://go.dev/learn/")) + mux.Handle("talks.golang.org/", redirectPrefix("https://go.dev/talks/")) mux.Handle("tour.golang.org/", redirectPrefix("https://go.dev/tour/")) // m.golang.org is an old shortcut for golang.org mail. @@ -217,6 +219,11 @@ func NewHandler(contentDir, goroot string) http.Handler { // Note: Registers for golang.org, go.dev/_, and golang.google.cn. proxy.RegisterHandlers(mux) + // Note: Using godevSite (non-China) for global mux registration because there's no sharing in talks. + // Don't need the hassle of two separate registrations for different domains in siteMux. + if err := talks.RegisterHandlers(mux, godevSite, contentFS); err != nil { + log.Fatalf("talks: %v", err) + } if err := tour.RegisterHandlers(mux); err != nil { log.Fatalf("tour: %v", err) } @@ -391,6 +398,7 @@ var validHosts = map[string]bool{ "beta.golang.org": true, "blog.golang.org": true, "m.golang.org": true, + "talks.golang.org": true, "tip.golang.org": true, "tour.golang.org": true, |