From c2801eebf31a6ae50451d0a688fcc560001c0de7 Mon Sep 17 00:00:00 2001 From: Ryan MacDonald Date: Tue, 2 May 2017 12:47:00 -0400 Subject: [PATCH 1/2] [Change] added support to nginx.conf.j2 template for the following variable pairings (nginx:ansible) use : nginx_use_method server_tokens : nginx_server_tokens resolver : nginx_resolver server_names_hash_max_size : nginx_server_names_hash_max_size --- templates/nginx.conf.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index cedfd72..92ebe82 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -7,7 +7,10 @@ worker_processes {{ nginx_worker_processes }}; events { worker_connections {{ nginx_worker_connections }}; - multi_accept {{ nginx_multi_accept }}; + multi_accept {{ nginx_multi_accept | default('off') }}; +{% if nginx_use_method %} + use {{ nginx_use_method }}; +{% endif %} } {% if nginx_extra_conf_options %} @@ -18,6 +21,12 @@ http { include {{ nginx_mime_file_path }}; default_type application/octet-stream; +{% if nginx_resolver %} + resolver {{ nginx_resolver }}; +{% endif %} + + server_tokens {{ nginx_server_tokens | default('on') }}; + server_names_hash_max_size {{ nginx_server_names_hash_max_size | default('512') }}; server_names_hash_bucket_size {{ nginx_server_names_hash_bucket_size }}; client_max_body_size {{ nginx_client_max_body_size }}; From b9c16bf4fb958cafa5767ac11ea052cb80162c08 Mon Sep 17 00:00:00 2001 From: Ryan MacDonald Date: Tue, 2 May 2017 13:00:50 -0400 Subject: [PATCH 2/2] [Change] defaults/main.yml modified to reflect new variables --- defaults/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 34c43ef..4da200a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,10 +12,15 @@ nginx_package_name: "nginx" nginx_worker_processes: "{{ ansible_processor_vcpus | default(ansible_processor_count) }}" nginx_worker_connections: "1024" nginx_multi_accept: "off" +#nginx_use_method: "epoll" nginx_error_log: "/var/log/nginx/error.log warn" nginx_access_log: "/var/log/nginx/access.log main buffer=16k" +nginx_tokens: "on" + +#nginx_resolver: "127.0.0.1" + nginx_sendfile: "on" nginx_tcp_nopush: "on" nginx_tcp_nodelay: "on" @@ -25,6 +30,7 @@ nginx_keepalive_requests: "100" nginx_client_max_body_size: "64m" +nginx_server_names_hash_max_size: "512" nginx_server_names_hash_bucket_size: "64" nginx_proxy_cache_path: ""