X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nginx.conf;fp=nginx.conf;h=bf85aaa880e6bfb949b615a2378fb7eabd21cde9;hb=bfab979f9e96b6dbfcd709c02c00826fe99fe1ee;hp=ad34fa266f8e77af9d2b1601148a0ecb12351d88;hpb=82f38dc6feee0bada4fb7129239f9c34710284cb;p=packages%2Fnginx.git

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