Mercurial > hg > nginx-site
changeset 2470:504536999408
Added upstream resolver info to upstream server resolve parameter.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Wed, 04 Dec 2019 15:36:40 +0300 |
parents | 98fd810c13e0 |
children | c8f0f30e1513 |
files | xml/en/docs/http/ngx_http_upstream_module.xml xml/en/docs/stream/ngx_stream_upstream_module.xml xml/ru/docs/http/ngx_http_upstream_module.xml xml/ru/docs/stream/ngx_stream_upstream_module.xml |
diffstat | 4 files changed, 16 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_upstream_module.xml +++ b/xml/en/docs/http/ngx_http_upstream_module.xml @@ -10,7 +10,7 @@ <module name="Module ngx_http_upstream_module" link="/en/docs/http/ngx_http_upstream_module.html" lang="en" - rev="83"> + rev="84"> <section id="summary"> @@ -255,21 +255,10 @@ without the need of restarting nginx (1. The server group must reside in the <link id="zone">shared memory</link>. <para> In order for this parameter to work, -the <link doc="ngx_http_core_module.xml" id="resolver"/> directive +the <literal>resolver</literal> directive must be specified in the -<link doc="ngx_http_core_module.xml" id="http"/> block. -Example: -<example> -http { - resolver 10.0.0.1; - - upstream u { - zone ...; - ... - server example.com resolve; - } -} -</example> +<link doc="ngx_http_core_module.xml" id="resolver">http</link> block +or in the corresponding <link id="resolver">upstream</link> block. </para> </tag-desc>
--- a/xml/en/docs/stream/ngx_stream_upstream_module.xml +++ b/xml/en/docs/stream/ngx_stream_upstream_module.xml @@ -9,7 +9,7 @@ <module name="Module ngx_stream_upstream_module" link="/en/docs/stream/ngx_stream_upstream_module.html" lang="en" - rev="38"> + rev="39"> <section id="summary"> @@ -235,21 +235,10 @@ without the need of restarting nginx. The server group must reside in the <link id="zone">shared memory</link>. <para> In order for this parameter to work, -the <link doc="ngx_stream_core_module.xml" id="resolver"/> directive +the <literal>resolver</literal> directive must be specified in the -<link doc="ngx_stream_core_module.xml" id="stream"/> block. -Example: -<example> -stream { - resolver 10.0.0.1; - - upstream u { - zone ...; - ... - server example.com:12345 resolve; - } -} -</example> +<link doc="ngx_stream_core_module.xml" id="resolver">stream</link> block +or in the corresponding <link id="resolver">upstream</link> block. </para> </tag-desc>
--- a/xml/ru/docs/http/ngx_http_upstream_module.xml +++ b/xml/ru/docs/http/ngx_http_upstream_module.xml @@ -10,7 +10,7 @@ <module name="Модуль ngx_http_upstream_module" link="/ru/docs/http/ngx_http_upstream_module.html" lang="ru" - rev="83"> + rev="84"> <section id="summary"> @@ -257,21 +257,10 @@ 5 запросов на <literal>backend1.example.com</literal> Группа должна находиться в <link id="zone">зоне разделяемой памяти</link>. <para> Для работы этого параметра -директива <link doc="ngx_http_core_module.xml" id="resolver"/> +директива <literal>resolver</literal> должна быть задана в блоке -<link doc="ngx_http_core_module.xml" id="http"/>. -Пример: -<example> -http { - resolver 10.0.0.1; - - upstream u { - zone ...; - ... - server example.com resolve; - } -} -</example> +<link doc="ngx_http_core_module.xml" id="resolver">http</link> +или в соответствующем блоке <link id="resolver">upstream</link>. </para> </tag-desc>
--- a/xml/ru/docs/stream/ngx_stream_upstream_module.xml +++ b/xml/ru/docs/stream/ngx_stream_upstream_module.xml @@ -9,7 +9,7 @@ <module name="Модуль ngx_stream_upstream_module" link="/ru/docs/stream/ngx_stream_upstream_module.html" lang="ru" - rev="38"> + rev="39"> <section id="summary"> @@ -235,21 +235,10 @@ 5 соединений на <literal>backend1.example.com:12345</literal> Группа должна находиться в <link id="zone">зоне разделяемой памяти</link>. <para> Для работы этого параметра -директива <link doc="ngx_stream_core_module.xml" id="resolver"/> +директива <literal>resolver</literal> должна быть задана в блоке -<link doc="ngx_stream_core_module.xml" id="stream"/>. -Пример: -<example> -stream { - resolver 10.0.0.1; - - upstream u { - zone ...; - ... - server example.com:12345 resolve; - } -} -</example> +<link doc="ngx_stream_core_module.xml" id="resolver">stream</link> +или в соответствующем блоке <link id="resolver">upstream</link>. </para> </tag-desc>