deploy: 98f84256e9

develop/setup/forward_proxy.html

@@ -165,8 +165,20 @@ this is necessary is in corporate environments behind a DMZ (demilitarized zone)
 Synapse supports routing outbound HTTP(S) requests via a proxy. Only HTTP(S)
 proxy is supported, not SOCKS proxy or anything else.</p>
 <h2 id="configure"><a class="header" href="#configure">Configure</a></h2>
-<p>The <code>http_proxy</code>, <code>https_proxy</code>, <code>no_proxy</code> environment variables are used to
-specify proxy settings. The environment variable is not case sensitive.</p>
+<p>The proxy settings can be configured in the homeserver configuration file via
+<a href="../usage/configuration/config_documentation.html#http_proxy"><code>http_proxy</code></a>,
+<a href="../usage/configuration/config_documentation.html#https_proxy"><code>https_proxy</code></a>, and
+<a href="../usage/configuration/config_documentation.html#no_proxy_hosts"><code>no_proxy_hosts</code></a>.</p>
+<p><code>homeserver.yaml</code> example:</p>
+<pre><code class="language-yaml">http_proxy: http://USERNAME:PASSWORD@10.0.1.1:8080/
+https_proxy: http://USERNAME:PASSWORD@proxy.example.com:8080/
+no_proxy_hosts:
+  - master.hostname.example.com
+  - 10.1.0.0/16
+  - 172.30.0.0/16
+</code></pre>
+<p>The proxy settings can also be configured via the <code>http_proxy</code>, <code>https_proxy</code>,
+<code>no_proxy</code> environment variables. The environment variable is not case sensitive.</p>
 <ul>
 <li><code>http_proxy</code>: Proxy server to use for HTTP requests.</li>
 <li><code>https_proxy</code>: Proxy server to use for HTTPS requests.</li>
@@ -208,7 +220,7 @@ will apply blacklisting of IP addresses.</p>
 <li>phone-home stats</li>
 <li>recaptcha validation</li>
 <li>CAS auth validation</li>
-<li>OpenID Connect</li>
+<li>OpenID Connect (OIDC)</li>
 <li>Outbound federation</li>
 <li>Federation (checking public key revocation)</li>
 <li>Fetching public keys of other servers</li>
@@ -217,7 +229,7 @@ will apply blacklisting of IP addresses.</p>
 <p>It will <strong>not be used</strong> for:</p>
 <ul>
 <li>Application Services</li>
-<li>Identity servers</li>
+<li>Matrix Identity servers</li>
 <li>In worker configurations
 <ul>
 <li>connections between workers</li>