- up to 1.11.9

[packages/nginx.git] / nginx.conf

diff --git a/nginx.conf b/nginx.conf
index 19abb8871166d2150258e1df1230f15da7728b8b..8ab1a0f7b296b47af2cc32f2964e0722158aa8a2 100644 (file)
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,26 +1,48 @@
-user                   nginx nginx;
-error_log              /var/log/nginx/nginx-@type@_error.log;
-pid                    /var/run/nginx-@type@.pid;
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
+
+user nginx nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /var/run/nginx.pid;
+
+# Load dynamic modules first
+include modules.d/*.conf;
 
 events {
-       worker_connections      2048;
+       worker_connections 2048;
        use epoll;
 }
 
 http {
-       include         /etc/nginx/mime.types;
-       default_type    application/octet-stream;
+       log_format main '$remote_addr - $remote_user [$time_local] $request '
+                       '"$status" $body_bytes_sent "$http_referer" '
+                       '"$http_user_agent" "$http_x_forwarded_for"';
+       access_log /var/log/nginx/access.log main;
+
+       sendfile on;
+       tcp_nopush on;
+       tcp_nodelay on;
+       keepalive_timeout 65;
+       types_hash_max_size 2048;
+
+       include /etc/nginx/mime.types;
+       default_type application/octet-stream;
 
-       log_format      main    '$remote_addr - $remote_user [$time_local] $request '
-                               '"$status" $body_bytes_sent "$http_referer" '
-                               '"$http_user_agent" "$http_x_forwarded_for"';
-       access_log      /var/log/nginx/nginx-@type@_access.log  main;
+       # Load modular configuration files from the /etc/nginx/conf.d directory.
+       # See http://nginx.org/en/docs/ngx_core_module.html#include
+       # for more information.
+       include /etc/nginx/conf.d/*.conf;
 
        server {
-               listen          80;
-               # listen 443 ssl;
+               listen 80 default_server;
+               listen [::]:80 default_server;
+               server_name  _;
 
                # https://wiki.mozilla.org/Security/Server_Side_TLS
+               #listen 443 ssl http2 default_server;
+               #listen [::]:443 ssl http2 default_server;
 
                # Certs sent to the client in SERVER HELLO are concatenated in ssl_certificate
                #ssl_certificate /etc/nginx/server.crt;
@@ -48,10 +70,9 @@ http {
                #ssl_stapling_verify on;
 
                # verify chain of trust of OCSP response using Root CA and Intermediate certs
-               #ssl_trusted_certificate /path/to/root_CA_cert_plus_intermediates;
+               #ssl_trusted_certificate /etc/nginx/ca.crt;
 
-               server_name     localhost;
-               access_log      /var/log/nginx/nginx-@type@_access.log main;
+               access_log      /var/log/nginx/access.log main;
 
                location / {
                        autoindex       on;
@@ -59,6 +80,7 @@ http {
                        index   index.html index.htm index.php;
                }
 
+               # Load configuration files for the default server block.
                include webapps.d/*.conf;
        }