Merge pull request #1 from rfxn/master

Add missing basic nginx.conf options

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: ""

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 }};