diff --git a/docs/development.md b/docs/development.md index ca0f748be..3cba6c0eb 100644 --- a/docs/development.md +++ b/docs/development.md @@ -101,7 +101,7 @@ $ TAG= REGISTRY=$USER/ingress-controller make image ## Deploying There are several ways to deploy the ingress controller onto a cluster. -Please check the [deployment guide](./deploy/) +Please check the [deployment guide](./deploy/index.md) ## Testing diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md index 28e427577..eec4ab782 100755 --- a/docs/user-guide/nginx-configuration/configmap.md +++ b/docs/user-guide/nginx-configuration/configmap.md @@ -19,7 +19,7 @@ data: This means that we want a value with boolean values we need to quote the values, like "true" or "false". Same for numbers, like "100". - "Slice" types (defined below as `[]string` or `[]int` can be provided as a comma-delimited string. + "Slice" types (defined below as `[]string` or `[]int`) can be provided as a comma-delimited string. ## Configuration options @@ -444,7 +444,7 @@ Sets the bucket size for the [map variables hash tables](http://nginx.org/en/doc ## proxy-real-ip-cidr -If use-proxy-protocol is enabled, proxy-real-ip-cidr defines the default the IP/network address of your external load balancer. +If use-forwarded-headers or use-proxy-protocol is enabled, proxy-real-ip-cidr defines the default the IP/network address of your external load balancer. ## proxy-set-headers @@ -508,6 +508,8 @@ The ordering of a ciphersuite is very important because it decides which algorit Please check the [Mozilla SSL Configuration Generator](https://mozilla.github.io/server-side-tls/ssl-config-generator/). +__Note:__ ssl_prefer_server_ciphers directive will be enabled by default for http context. + ## ssl-ecdh-curve Specifies a curve for ECDHE ciphers. diff --git a/rootfs/etc/nginx/lua/certificate.lua b/rootfs/etc/nginx/lua/certificate.lua index cb9e1ed82..aab994c5e 100644 --- a/rootfs/etc/nginx/lua/certificate.lua +++ b/rootfs/etc/nginx/lua/certificate.lua @@ -57,14 +57,14 @@ local function get_pem_cert_uid(raw_hostname) return uid end - local wildcard_hosatname, _, err = re_sub(hostname, "^[^\\.]+\\.", "*.", "jo") + local wildcard_hostname, _, err = re_sub(hostname, "^[^\\.]+\\.", "*.", "jo") if err then ngx.log(ngx.ERR, "error: ", err) return uid end - if wildcard_hosatname then - uid = ngx.shared.certificate_servers:get(wildcard_hosatname) + if wildcard_hostname then + uid = certificate_servers:get(wildcard_hostname) end return uid diff --git a/rootfs/etc/nginx/lua/plugins/README.md b/rootfs/etc/nginx/lua/plugins/README.md index f22ed0070..5960faf37 100644 --- a/rootfs/etc/nginx/lua/plugins/README.md +++ b/rootfs/etc/nginx/lua/plugins/README.md @@ -14,7 +14,7 @@ By defining functions with the following names, you can run your custom Lua code - `init_worker`: useful for initializing some data per Nginx worker process - `rewrite`: useful for modifying request, changing headers, redirection, dropping request, doing authentication etc - - `header`: this is called when backend response header is received, it is useful for modifying response headers + - `header_filter`: this is called when backend response header is received, it is useful for modifying response headers - `log`: this is called when request processing is commpleted and response is delivered to the client Check this [`hello_world`](https://github.com/kubernetes/ingress-nginx/tree/master/rootfs/etc/nginx/lua/plugins/hello_world) plugin as a simple example or refer to [OpenID Connect integration](https://github.com/ElvinEfendi/ingress-nginx-openidc/tree/master/rootfs/etc/nginx/lua/plugins/openidc) for more advanced usage.