[packages/nginx/dev-dynamic] update config from fedora

[glen]

commit bfab979f9e96b6dbfcd709c02c00826fe99fe1ee
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Wed Oct 19 22:39:16 2016 +0300

    update config from fedora
    
    and do not format with tabs (indent is ok), looks different everywhere

 nginx.conf | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)
---
diff --git a/nginx.conf b/nginx.conf
index ad34fa2..bf85aaa 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,26 +1,45 @@
-user                   nginx nginx;
-error_log              /var/log/nginx/error.log;
-pid                    /var/run/nginx.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;
 
 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/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;
@@ -59,6 +78,7 @@ http {
                        index   index.html index.htm index.php;
                }
 
+               # Load configuration files for the default server block.
                include webapps.d/*.conf;
        }
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/bfab979f9e96b6dbfcd709c02c00826fe99fe1ee

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit