Mercurial > hg > nginx-site
changeset 689:3cc1c7bb0674
Documented geoip_org directive and fixed parameter names
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Wed, 26 Sep 2012 12:36:37 +0000 |
parents | d05c1c996ced |
children | c0daabbd8c21 |
files | xml/en/docs/http/ngx_http_geoip_module.xml xml/ru/docs/http/ngx_http_geoip_module.xml |
diffstat | 2 files changed, 50 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_geoip_module.xml +++ b/xml/en/docs/http/ngx_http_geoip_module.xml @@ -53,7 +53,7 @@ http { <section id="directives" name="Directives"> <directive name="geoip_country"> -<syntax><value>database</value></syntax> +<syntax><value>file</value></syntax> <default/> <context>http</context> @@ -88,7 +88,7 @@ country name, for example, <directive name="geoip_city"> -<syntax><value>database</value></syntax> +<syntax><value>file</value></syntax> <default/> <context>http</context> @@ -140,6 +140,29 @@ postal code. </directive> +<directive name="geoip_org"> +<syntax><value>file</value></syntax> +<default/> +<context>http</context> +<appeared-in>1.0.3</appeared-in> + +<para> +Specifies a database used to determine an organization +depending on the client IP address. +The following variable is available when using this database: +<list type="tag"> + +<tag-name><var>$geoip_org</var></tag-name> +<tag-desc> +organization name, for example, “The University of Melbourne”. +</tag-desc> + +</list> +</para> + +</directive> + + <directive name="geoip_proxy"> <syntax><value>address</value> | <value>CIDR</value></syntax> <default/>
--- a/xml/ru/docs/http/ngx_http_geoip_module.xml +++ b/xml/ru/docs/http/ngx_http_geoip_module.xml @@ -53,7 +53,7 @@ http { <section id="directives" name="Директивы"> <directive name="geoip_country"> -<syntax><value>база</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http</context> @@ -88,7 +88,7 @@ http { <directive name="geoip_city"> -<syntax><value>база</value></syntax> +<syntax><value>файл</value></syntax> <default/> <context>http</context> @@ -140,6 +140,29 @@ http { </directive> +<directive name="geoip_org"> +<syntax><value>файл</value></syntax> +<default/> +<context>http</context> +<appeared-in>1.0.3</appeared-in> + +<para> +Задаёт базу данных для определения названия организации +в зависимости от значения IP-адреса клиента. +При использовании этой базы данных доступна следующая переменная: +<list type="tag"> + +<tag-name><var>$geoip_org</var></tag-name> +<tag-desc> +название организации, например, “The University of Melbourne”. +</tag-desc> + +</list> +</para> + +</directive> + + <directive name="geoip_proxy"> <syntax><value>адрес</value> | <value>CIDR</value></syntax> <default/>