diff options
| author | Till Faelligen <2353100+S7evinK@users.noreply.github.com> | 2024-11-14 13:42:51 +0100 |
|---|---|---|
| committer | Till Faelligen <2353100+S7evinK@users.noreply.github.com> | 2024-11-14 13:42:51 +0100 |
| commit | 79b87c7a08045a5b5c676b97cedd49250bff2237 (patch) | |
| tree | d0716b0d3bcb85be2a05534bf1cab0597136b168 /setup/base/base.go | |
| parent | 488009ca905be78c0cbd5364e879d61232b32868 (diff) | |
| parent | 6cd1285ca0276bebd407110c37031bc4622f0b79 (diff) | |
Merge branch 'main' of github.com:matrix-org/dendrite
Diffstat (limited to 'setup/base/base.go')
| -rw-r--r-- | setup/base/base.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setup/base/base.go b/setup/base/base.go index 82068aa9..26615fc0 100644 --- a/setup/base/base.go +++ b/setup/base/base.go @@ -52,6 +52,7 @@ var staticContent embed.FS //go:embed static/client/login var loginFallback embed.FS +var StaticContent = staticContent const HTTPServerTimeout = time.Minute * 5 @@ -235,7 +236,6 @@ func SetupAndServeHTTP( logrus.WithError(err).Fatal("failed to serve unix socket") } } - } else { if err := externalServ.ListenAndServe(); err != nil { if err != http.ErrServerClosed { |