mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-20 13:23:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

comments

Browse source
This commit is contained in:
Aiden McClelland 2020-06-02 12:58:24 -06:00
parent c8cf274b0d
commit 2fb1579240
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/basecomponent/base.go
View file

@ -102,9 +102,9 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string, enableHTTPAPIs
Host: fmt.Sprintf("%s:%d", cfg.Proxy.Host, cfg.Proxy.Port), Host: fmt.Sprintf("%s:%d", cfg.Proxy.Host, cfg.Proxy.Port),
})} })}
} }
httpmux := mux.NewRouter() httpmux := mux.NewRouter()
return &BaseDendrite{ return &BaseDendrite{
componentName: componentName, componentName: componentName,
EnableHTTPAPIs: enableHTTPAPIs, EnableHTTPAPIs: enableHTTPAPIs,

4
internal/config/config.go
View file

@ -268,9 +268,13 @@ type Dendrite struct {
// The config for logging informations. Each hook will be added to logrus. // The config for logging informations. Each hook will be added to logrus.
Logging []LogrusHook `yaml:"logging"` Logging []LogrusHook `yaml:"logging"`
// The config for setting a proxy to use for server->server requests
Proxy *struct { Proxy *struct {
// The protocol for the proxy (http / https / socks5)
Protocol string `yaml:"protocol"` Protocol string `yaml:"protocol"`
// The host where the proxy is listening
Host string `yaml:"host"` Host string `yaml:"host"`
// The port on which the proxy is listening
Port uint16 `yaml:"port"` Port uint16 `yaml:"port"`
} `yaml:"proxy"` } `yaml:"proxy"`