From 97e06a8321d41164eb5f226083be28544461f059 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 18 Nov 2022 12:44:22 +0000 Subject: [PATCH] oh yes, yaml, right --- clientapi/routing/register.go | 4 ---- setup/config/config_global.go | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/clientapi/routing/register.go b/clientapi/routing/register.go index f680c3491..e23da8013 100644 --- a/clientapi/routing/register.go +++ b/clientapi/routing/register.go @@ -39,7 +39,6 @@ import ( "github.com/matrix-org/gomatrixserverlib/tokens" "github.com/matrix-org/util" "github.com/prometheus/client_golang/prometheus" - "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" "github.com/matrix-org/dendrite/clientapi/auth" @@ -553,12 +552,9 @@ func Register( var r registerRequest host := gomatrixserverlib.ServerName(req.Host) - logrus.Infof("Getting virtual host for %q", host) if v := cfg.Matrix.VirtualHostForHTTPHost(host); v != nil { r.ServerName = v.ServerName - logrus.Infof("Found virtual host %q", host) } else { - logrus.Infof("Using default %q", cfg.Matrix.ServerName) r.ServerName = cfg.Matrix.ServerName } sessionID := gjson.GetBytes(reqBody, "auth.session").String() diff --git a/setup/config/config_global.go b/setup/config/config_global.go index e4e1344d8..801c68450 100644 --- a/setup/config/config_global.go +++ b/setup/config/config_global.go @@ -208,10 +208,10 @@ type VirtualHost struct { MatchHTTPHosts []gomatrixserverlib.ServerName `yaml:"match_http_hosts"` // Is registration enabled on this virtual host? - AllowRegistration bool `json:"allow_registration"` + AllowRegistration bool `yaml:"allow_registration"` // Is guest registration enabled on this virtual host? - AllowGuests bool `json:"allow_guests"` + AllowGuests bool `yaml:"allow_guests"` } func (v *VirtualHost) Verify(configErrs *ConfigErrors) {