move httpToHttpsRedirect and canonicalURLRedirect to nginx

sourcegraph · Nov 10, 2018 · 773be37 · 773be37
1 parent 9b4fa0b
commit 773be37
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 451 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ All notable changes to Sourcegraph are documented in this file.
 - Removed the `httpStrictTransportSecurity` site configuration option. Use [nginx configuration](https://docs.sourcegraph.com/admin/nginx) for this instead.
 - Removed the `tls.letsencrypt` site configuration option. Use [nginx configuration](https://docs.sourcegraph.com/admin/nginx) for this instead.
 - Removed the `tls.cert` and `tls.key` site configuration options. Use [nginx configuration](https://docs.sourcegraph.com/admin/nginx) for this instead.
+- Removed the `httpToHttpsRedirect` and `experimentalFeatures.canonicalURLRedireect` site configuration options. Use [nginx configuration](https://docs.sourcegraph.com/admin/nginx) for these instead.
 
 ### Removed
 

diff --git a/cmd/frontend/internal/cli/http.go b/cmd/frontend/internal/cli/http.go
@@ -69,7 +69,6 @@ func newExternalHTTPHandler(ctx context.Context) (http.Handler, error) {
 	h = middleware.SourcegraphComGoGetHandler(h)
 	h = middleware.BlackHole(h)
 	h = secureHeadersMiddleware(h)
-	h = middleware.CanonicalURL(h)
 	h = gcontext.ClearHandler(h)
 	h = middleware.Trace(h)
 	return h, nil

diff --git a/cmd/frontend/internal/cli/middleware/redirect.go b/cmd/frontend/internal/cli/middleware/redirect.go