From 357ab200f755483e95e2ae4d5b97f483beade3b5 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 28 Dec 2015 10:01:42 -0600 Subject: [PATCH] PR #36 follow-up: rename var to nginx_extra_http_options. --- README.md | 4 ++-- defaults/main.yml | 6 +++--- templates/nginx.conf.j2 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index dfbbeb1..effc254 100644 --- a/README.md +++ b/README.md @@ -78,11 +78,11 @@ This value determines the largest file upload possible, as uploads are passed th Set as the `proxy_cache_path` directive in the `nginx.conf` file. By default, this will not be configured (if left as an empty string), but if you wish to use Nginx as a reverse proxy, you can set this to a valid value (e.g. `"/var/cache/nginx keys_zone=cache:32m"`) to use Nginx's cache (further proxy configuration can be done in individual server configurations). - nginx_extra_options: "" + nginx_extra_http_options: "" Extra lines to be inserted in the top-level `http` block in `nginx.conf`. The value should be defined literally (as you would insert it directly in the `nginx.conf`, adhering to the Nginx configuration syntax - such as `;` for line termination, etc.), for example: - nginx_extra_options: | + nginx_extra_http_options: | proxy_buffering off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Scheme $scheme; diff --git a/defaults/main.yml b/defaults/main.yml index e383993..74b900c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,9 +19,9 @@ nginx_client_max_body_size: "64m" nginx_proxy_cache_path: "" -nginx_extra_options: "" -# Example extra options, printed inside the main server http config: -# nginx_extra_options: | +nginx_extra_http_options: "" +# Example extra http options, printed inside the main server http config: +# nginx_extra_http_options: | # proxy_buffering off; # proxy_set_header X-Real-IP $remote_addr; # proxy_set_header X-Scheme $scheme; diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index a4cead9..7675281 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -36,8 +36,8 @@ http { proxy_cache_path {{ nginx_proxy_cache_path }}; {% endif %} -{% if nginx_extra_options %} - {{ nginx_extra_options }} +{% if nginx_extra_http_options %} + {{ nginx_extra_http_options }} {% endif %} {% for upstream in nginx_upstreams %}