diff options
| author | S7evinK <2353100+S7evinK@users.noreply.github.com> | 2022-02-17 13:54:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 13:54:29 +0100 |
| commit | f51e2a99e93f03eb9aed59b2643170dede1f4fe8 (patch) | |
| tree | cac65d36057420b7ac86d7fbf65e336eb0cc79b8 /setup | |
| parent | a4681bc7f77530cd73fc510d641c51fbb2855f2e (diff) | |
Remove outbound proxy, http.ProxyFromEnvironment is now used (#2191)
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/config/config_federationapi.go | 4 | ||||
| -rw-r--r-- | setup/config/config_test.go | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/setup/config/config_federationapi.go b/setup/config/config_federationapi.go index 4f5f49de..95e70503 100644 --- a/setup/config/config_federationapi.go +++ b/setup/config/config_federationapi.go @@ -29,8 +29,6 @@ type FederationAPI struct { // on remote federation endpoints. This is not recommended in production! DisableTLSValidation bool `yaml:"disable_tls_validation"` - Proxy Proxy `yaml:"proxy_outbound"` - // Perspective keyservers, to use as a backup when direct key fetch // requests don't succeed KeyPerspectives KeyPerspectives `yaml:"key_perspectives"` @@ -50,8 +48,6 @@ func (c *FederationAPI) Defaults(generate bool) { c.FederationMaxRetries = 16 c.DisableTLSValidation = false - - c.Proxy.Defaults() } func (c *FederationAPI) Verify(configErrs *ConfigErrors, isMonolith bool) { diff --git a/setup/config/config_test.go b/setup/config/config_test.go index 5aa54929..97c98e57 100644 --- a/setup/config/config_test.go +++ b/setup/config/config_test.go @@ -118,11 +118,6 @@ federation_sender: conn_max_lifetime: -1 send_max_retries: 16 disable_tls_validation: false - proxy_outbound: - enabled: false - protocol: http - host: localhost - port: 8080 key_server: internal_api: listen: http://localhost:7779 |