From f51e2a99e93f03eb9aed59b2643170dede1f4fe8 Mon Sep 17 00:00:00 2001
From: S7evinK <2353100+S7evinK@users.noreply.github.com>
Date: Thu, 17 Feb 2022 13:54:29 +0100
Subject: [PATCH] Remove outbound proxy, http.ProxyFromEnvironment is now used
 (#2191)

---
 dendrite-config.yaml                 | 7 -------
 setup/config/config_federationapi.go | 4 ----
 setup/config/config_test.go          | 5 -----
 3 files changed, 16 deletions(-)

diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index 38b146d70..b71e8d845 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -204,13 +204,6 @@ federation_api:
   # enable this option in production as it presents a security risk!
   disable_tls_validation: false
 
-  # Use the following proxy server for outbound federation traffic.
-  proxy_outbound:
-    enabled: false
-    protocol: http
-    host: localhost
-    port: 8080
-
   # Perspective keyservers to use as a backup when direct key fetches fail. This may
   # be required to satisfy key requests for servers that are no longer online when
   # joining some rooms.
diff --git a/setup/config/config_federationapi.go b/setup/config/config_federationapi.go
index 4f5f49de8..95e705033 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 5aa54929e..97c98e57f 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