mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove outbound proxy, http.ProxyFromEnvironment is now used (#2191)"

Browse source 
This reverts commit f51e2a99e9.
This commit is contained in:
Paige Thompson 2023-03-23 20:14:25 -07:00
parent 234ed603e6
commit a62941cc80
No known key found for this signature in database
GPG key ID: 071CFBC989D32591
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
setup/config/config_federationapi.go
View file

@ -31,6 +31,7 @@ type FederationAPI struct {
// open for reuse for future requests. Connections will be closed quicker // open for reuse for future requests. Connections will be closed quicker
// but we may spend more time on TLS handshakes instead. // but we may spend more time on TLS handshakes instead.
DisableHTTPKeepalives bool `yaml:"disable_http_keepalives"` DisableHTTPKeepalives bool `yaml:"disable_http_keepalives"`
Proxy Proxy `yaml:"proxy_outbound"`
// Perspective keyservers, to use as a backup when direct key fetch // Perspective keyservers, to use as a backup when direct key fetch
// requests don't succeed // requests don't succeed
@ -65,6 +66,8 @@ func (c *FederationAPI) Defaults(opts DefaultOpts) {
c.Database.ConnectionString = "file:federationapi.db" c.Database.ConnectionString = "file:federationapi.db"
} }
} }
c.Proxy.Defaults()
} }
func (c *FederationAPI) Verify(configErrs *ConfigErrors) { func (c *FederationAPI) Verify(configErrs *ConfigErrors) {

5
setup/config/config_test.go
View file

@ -103,6 +103,11 @@ client_api:
federation_api: federation_api:
database: database:
connection_string: file:federationapi.db connection_string: file:federationapi.db
proxy_outbound:
enabled: false
protocol: http
host: localhost
port: 8080
key_server: key_server:
database: database:
connection_string: file:keyserver.db connection_string: file:keyserver.db