Mercurial > hg > nginx-site

changeset 1372:e0e1e5db06bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documented the proxy_ssl_certificate directive and friends.
author Yaroslav Zhuravlev <yar@nginx.com>
date Thu, 11 Dec 2014 14:01:23 +0300
parents 5475304b61ad
children 47e19b6d3dbc
files xml/en/docs/http/ngx_http_proxy_module.xml xml/en/docs/http/ngx_http_uwsgi_module.xml xml/ru/docs/http/ngx_http_proxy_module.xml xml/ru/docs/http/ngx_http_uwsgi_module.xml
diffstat 4 files changed, 204 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_proxy_module.xml
+++ b/xml/en/docs/http/ngx_http_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_proxy_module"
         link="/en/docs/http/ngx_http_proxy_module.html"
         lang="en"
-        rev="31">
+        rev="32">
 
 <section id="summary">
 
@@ -1547,6 +1547,38 @@ proxy_set_header Accept-Encoding "";
 </directive>
 
 
+<directive name="proxy_ssl_certificate">
+<syntax><value>file</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Specifies a <value>file</value> with the certificate in the PEM format
+used for authentication to a proxied HTTPS server.
+</para>
+
+</directive>
+
+
+<directive name="proxy_ssl_certificate_key">
+<syntax><value>file</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Specifies a <value>file</value> with the secret key in the PEM format
+used for authentication to a proxied HTTPS server.
+</para>
+
+</directive>
+
+
 <directive name="proxy_ssl_ciphers">
 <syntax><value>ciphers</value></syntax>
 <default>DEFAULT</default>
@@ -1608,6 +1640,24 @@ By default, the host part of the <link i
 </directive>
 
 
+<directive name="proxy_ssl_password_file">
+<syntax><value>file</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Specifies a <value>file</value> with passphrases for
+<link id="proxy_ssl_certificate_key">secret keys</link>
+where each passphrase is specified on a separate line.
+Passphrases are tried in turn when loading the key.
+</para>
+
+</directive>
+
+
 <directive name="proxy_ssl_server_name">
 <syntax><literal>on</literal> | <literal>off</literal></syntax>
 <default>off</default>
--- a/xml/en/docs/http/ngx_http_uwsgi_module.xml
+++ b/xml/en/docs/http/ngx_http_uwsgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_uwsgi_module"
         link="/en/docs/http/ngx_http_uwsgi_module.html"
         lang="en"
-        rev="13">
+        rev="14">
 
 <section id="summary">
 
@@ -1079,6 +1079,38 @@ the connection is closed.
 </directive>
 
 
+<directive name="uwsgi_ssl_certificate">
+<syntax><value>file</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Specifies a <value>file</value> with the certificate in the PEM format
+used for authentication to a secured uwsgi server.
+</para>
+
+</directive>
+
+
+<directive name="uwsgi_ssl_certificate_key">
+<syntax><value>file</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Specifies a <value>file</value> with the secret key in the PEM format
+used for authentication to a secured uwsgi server.
+</para>
+
+</directive>
+
+
 <directive name="uwsgi_ssl_ciphers">
 <syntax><value>ciphers</value></syntax>
 <default>DEFAULT</default>
@@ -1140,6 +1172,24 @@ By default, the host part from <link id=
 </directive>
 
 
+<directive name="uwsgi_ssl_password_file">
+<syntax><value>file</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Specifies a <value>file</value> with passphrases for
+<link id="uwsgi_ssl_certificate_key">secret keys</link>
+where each passphrase is specified on a separate line.
+Passphrases are tried in turn when loading the key.
+</para>
+
+</directive>
+
+
 <directive name="uwsgi_ssl_protocols">
 <syntax>
     [<literal>SSLv2</literal>]
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml
+++ b/xml/ru/docs/http/ngx_http_proxy_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_proxy_module"
         link="/ru/docs/http/ngx_http_proxy_module.html"
         lang="ru"
-        rev="31">
+        rev="32">
 
 <section id="summary">
 
@@ -1543,6 +1543,38 @@ proxy_set_header Accept-Encoding "";
 </directive>
 
 
+<directive name="proxy_ssl_certificate">
+<syntax><value>файл</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Задаёт <value>файл</value> с сертификатом в формате PEM
+для аутентификации на проксируемом HTTPS-сервере.
+</para>
+
+</directive>
+
+
+<directive name="proxy_ssl_certificate_key">
+<syntax><value>файл</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Задаёт <value>файл</value> с секретным ключом в формате PEM
+для аутентификации на проксируемом HTTPS-сервере.
+</para>
+
+</directive>
+
+
 <directive name="proxy_ssl_ciphers">
 <syntax><value>ciphers</value></syntax>
 <default>DEFAULT</default>
@@ -1605,6 +1637,24 @@ proxy_set_header Accept-Encoding "";
 </directive>
 
 
+<directive name="proxy_ssl_password_file">
+<syntax><value>файл</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Задаёт <value>файл</value> с паролями от
+<link id="proxy_ssl_certificate_key">секретных ключей</link>,
+где каждый пароль указан на отдельной строке.
+Пароли применяются по очереди в момент загрузки ключа.
+</para>
+
+</directive>
+
+
 <directive name="proxy_ssl_server_name">
 <syntax><literal>on</literal> | <literal>off</literal></syntax>
 <default>off</default>
--- a/xml/ru/docs/http/ngx_http_uwsgi_module.xml
+++ b/xml/ru/docs/http/ngx_http_uwsgi_module.xml
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_uwsgi_module"
         link="/ru/docs/http/ngx_http_uwsgi_module.html"
         lang="ru"
-        rev="13">
+        rev="14">
 
 <section id="summary">
 
@@ -1072,6 +1072,38 @@ uwsgi-сервер.
 </directive>
 
 
+<directive name="uwsgi_ssl_certificate">
+<syntax><value>файл</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Задаёт <value>файл</value> с сертификатом в формате PEM
+для аутентификации на suwsgi-сервере.
+</para>
+
+</directive>
+
+
+<directive name="uwsgi_ssl_certificate_key">
+<syntax><value>файл</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Задаёт <value>файл</value> с секретным ключом в формате PEM
+для аутентификации на suwsgi-сервере.
+</para>
+
+</directive>
+
+
 <directive name="uwsgi_ssl_ciphers">
 <syntax><value>ciphers</value></syntax>
 <default>DEFAULT</default>
@@ -1133,6 +1165,24 @@ uwsgi-сервер.
 </directive>
 
 
+<directive name="uwsgi_ssl_password_file">
+<syntax><value>файл</value></syntax>
+<default/>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.7.8</appeared-in>
+
+<para>
+Задаёт <value>файл</value> с паролями от
+<link id="uwsgi_ssl_certificate_key">секретных ключей</link>,
+где каждый пароль указан на отдельной строке.
+Пароли применяются по очереди в момент загрузки ключа.
+</para>
+
+</directive>
+
+
 <directive name="uwsgi_ssl_protocols">
 <syntax>
     [<literal>SSLv2</literal>]