aboutsummaryrefslogtreecommitdiffstats
path: root/main/nginx/nginx.conf
diff options
context:
space:
mode:
Diffstat (limited to 'main/nginx/nginx.conf')
-rw-r--r--main/nginx/nginx.conf10
1 files changed, 3 insertions, 7 deletions
diff --git a/main/nginx/nginx.conf b/main/nginx/nginx.conf
index bc784a31879..89fa9854bf6 100644
--- a/main/nginx/nginx.conf
+++ b/main/nginx/nginx.conf
@@ -14,9 +14,8 @@ error_log /var/log/nginx/error.log warn;
# Includes files with directives to load dynamic modules.
include /etc/nginx/modules/*.conf;
-# Uncomment to include files with config snippets into the root context.
-# NOTE: This will be enabled by default in Alpine 3.15.
-#include /etc/nginx/conf.d/*.conf;
+# Include files with config snippets into the root context.
+include /etc/nginx/conf.d/*.conf;
events {
# The maximum number of simultaneous connections that can be opened by
@@ -32,7 +31,7 @@ http {
# Name servers used to resolve names of upstream servers into addresses.
# It's also needed when using tcpsocket and udpsocket in Lua modules.
- #resolver 1.1.1.1 1.0.0.1 2606:4700:4700::1111 2606:4700:4700::1001;
+ #resolver 1.1.1.1 1.0.0.1 [2606:4700:4700::1111] [2606:4700:4700::1001];
# Don't tell nginx version to the clients. Default is 'on'.
server_tokens off;
@@ -102,6 +101,3 @@ http {
# Includes virtual hosts configs.
include /etc/nginx/http.d/*.conf;
}
-
-# TIP: Uncomment if you use stream module.
-#include /etc/nginx/stream.conf;