PR #36 follow-up: rename var to nginx_extra_http_options.

pull/40/head 1.5.0
Jeff Geerling 8 years ago
parent 9848800982
commit 357ab200f7
  1. 4
      README.md
  2. 6
      defaults/main.yml
  3. 4
      templates/nginx.conf.j2

@ -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). 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: 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_buffering off;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Scheme $scheme; proxy_set_header X-Scheme $scheme;

@ -19,9 +19,9 @@ nginx_client_max_body_size: "64m"
nginx_proxy_cache_path: "" nginx_proxy_cache_path: ""
nginx_extra_options: "" nginx_extra_http_options: ""
# Example extra options, printed inside the main server http config: # Example extra http options, printed inside the main server http config:
# nginx_extra_options: | # nginx_extra_http_options: |
# proxy_buffering off; # proxy_buffering off;
# proxy_set_header X-Real-IP $remote_addr; # proxy_set_header X-Real-IP $remote_addr;
# proxy_set_header X-Scheme $scheme; # proxy_set_header X-Scheme $scheme;

@ -36,8 +36,8 @@ http {
proxy_cache_path {{ nginx_proxy_cache_path }}; proxy_cache_path {{ nginx_proxy_cache_path }};
{% endif %} {% endif %}
{% if nginx_extra_options %} {% if nginx_extra_http_options %}
{{ nginx_extra_options }} {{ nginx_extra_http_options }}
{% endif %} {% endif %}
{% for upstream in nginx_upstreams %} {% for upstream in nginx_upstreams %}