diff --git a/examples/rewrite/index.html b/examples/rewrite/index.html index e410c0197..55a4d0b8f 100644 --- a/examples/rewrite/index.html +++ b/examples/rewrite/index.html @@ -1048,8 +1048,8 @@
  • - - Validation + + Examples
  • - - Validation + + Examples
  • + +
  • + + HTTP2 Push Preload. + +
  • @@ -1510,6 +1517,13 @@ Enable CORS +
  • + +
  • + + HTTP2 Push Preload. + +
  • @@ -1778,10 +1792,6 @@ table below.

    -nginx.ingress.kubernetes.io/add-base-url -"true" or "false" - - nginx.ingress.kubernetes.io/app-root string @@ -1834,10 +1844,6 @@ table below.

    string -nginx.ingress.kubernetes.io/base-url-scheme -string - - nginx.ingress.kubernetes.io/canary "true" or "false" @@ -1902,6 +1908,10 @@ table below.

    "true" or "false" +nginx.ingress.kubernetes.io/http2-push-preload +"true" or "false" + + nginx.ingress.kubernetes.io/limit-connections number @@ -2140,8 +2150,6 @@ table below.

    Rewrite

    In some scenarios the exposed URL in the backend service differs from the specified path in the Ingress rule. Without a rewrite any request will return 404. Set the annotation nginx.ingress.kubernetes.io/rewrite-target to the path expected by the service.

    -

    If the application contains relative links it is possible to add an additional annotation nginx.ingress.kubernetes.io/add-base-url that will prepend a base tag in the header of the returned HTML from the backend.

    -

    If the scheme of base tag need to be specific, set the annotation nginx.ingress.kubernetes.io/base-url-scheme to the scheme such as http and https.

    If the Application Root is exposed in a different path and needs to be redirected, set the annotation nginx.ingress.kubernetes.io/app-root to redirect requests for /.

    Example

    @@ -2292,6 +2300,14 @@ location enabling this functionality.

    Note

    For more information please see https://enable-cors.org

    +

    HTTP2 Push Preload.

    +

    Enables automatic conversion of preload links specified in the “Link” response header fields into push requests.

    +
    +

    Example

    + +

    Server Alias

    To add Server Aliases to an Ingress rule add the annotation nginx.ingress.kubernetes.io/server-alias: "<alias>". This will create a server with the same configuration, but a different server_name as the provided host.

    diff --git a/user-guide/nginx-configuration/configmap/index.html b/user-guide/nginx-configuration/configmap/index.html index 9c3bea06e..a3f240079 100644 --- a/user-guide/nginx-configuration/configmap/index.html +++ b/user-guide/nginx-configuration/configmap/index.html @@ -793,6 +793,13 @@ max-worker-connections +
  • + +
  • + + max-worker-open-files + +
  • @@ -2192,6 +2199,13 @@ max-worker-connections +
  • + +
  • + + max-worker-open-files + +
  • @@ -3019,7 +3033,12 @@ Same for numbers, like "100".

    max-worker-connections int -16384 +0 + + +max-worker-open-files +int +0 map-hash-bucket-size @@ -3581,7 +3600,13 @@ Example for json output:

    References: http://nginx.org/en/docs/ngx_core_module.html#multi_accept

    max-worker-connections

    -

    Sets the maximum number of simultaneous connections that can be opened by each worker process

    +

    Sets the maximum number of simultaneous connections that can be opened by each worker process. +The default of 0 uses the value of max-worker-open-files. +default: 0

    +

    max-worker-open-files

    +

    Sets the maximum number of files that can be opened by each worker process. +The default of 0 means "max open files (system's limit) / worker-processes - 1024". +default: 0

    map-hash-bucket-size

    Sets the bucket size for the map variables hash tables. The details of setting up hash tables are provided in a separate document.

    proxy-real-ip-cidr