diff --git a/README.md b/README.md index eec62b6db..e556c64cb 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ * Submit github issues for any feature enhancements, bugs or documentation problems * **Support**: Join to [Kubernetes Slack](http://slack.kubernetes.io/) to ask questions to get support from the maintainers and other developers * Questions/comments can also be posted as [github issues](https://github.com/kubernetes/ingress-nginx/issues) -* **Discuss**: Tweet using the `#NginxIngress` hashtag +* **Discuss**: Tweet using the `#IngressNginx` hashtag ## Description diff --git a/docs/user-guide/nginx-configuration/annotations.md b/docs/user-guide/nginx-configuration/annotations.md index f58d5c54d..8ce8ccf22 100644 --- a/docs/user-guide/nginx-configuration/annotations.md +++ b/docs/user-guide/nginx-configuration/annotations.md @@ -143,7 +143,7 @@ To enable consistent hashing for a backend: ### Custom NGINX load balancing -This is similar to https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/configmap.md#load-balance but configures load balancing algorithm per ingress. +This is similar to https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/configmap.md#load-balance but configures load balancing algorithm per ingress. Note that `nginx.ingress.kubernetes.io/upstream-hash-by` takes preference over this. If this and `nginx.ingress.kubernetes.io/upstream-hash-by` are not set then we fallback to using globally configured load balancing algorithm. ### Custom NGINX upstream vhost diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md index f164d94dd..db9d10094 100644 --- a/docs/user-guide/nginx-configuration/configmap.md +++ b/docs/user-guide/nginx-configuration/configmap.md @@ -429,7 +429,7 @@ _References:_ Sets the name of the secret that contains Diffie-Hellman key to help with "Perfect Forward Secrecy". _References:_ -- https://wiki.openssl.org/index.php/Manual:Dhparam(1) +- https://wiki.openssl.org/index.php/Diffie-Hellman_parameters - https://wiki.mozilla.org/Security/Server_Side_TLS#DHE_handshake_and_dhparam - http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_dhparam diff --git a/docs/user-guide/nginx-configuration/index.md b/docs/user-guide/nginx-configuration/index.md index 9cd5f6a15..bace1a086 100644 --- a/docs/user-guide/nginx-configuration/index.md +++ b/docs/user-guide/nginx-configuration/index.md @@ -4,4 +4,4 @@ There are three ways to customize NGINX: 1. [ConfigMap](./configmap.md): using a Configmap to set global configurations in NGINX. 2. [Annotations](./annotations.md): use this if you want a specific configuration for a particular Ingress rule. -3. [Custom template](./custom-template.md): when more specific settings are required, like [open_file_cache](http://nginx.org/en/./http/ngx_http_core_module.html#open_file_cache), adjust [listen](http://nginx.org/en/./http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change the configuration through the ConfigMap. +3. [Custom template](./custom-template.md): when more specific settings are required, like [open_file_cache](http://nginx.org/en/docs/http/ngx_http_core_module.html#open_file_cache), adjust [listen](http://nginx.org/en/docs/http/ngx_http_core_module.html#listen) options as `rcvbuf` or when is not possible to change the configuration through the ConfigMap. diff --git a/docs/user-guide/tls.md b/docs/user-guide/tls.md index 810c5c0d9..93db6499d 100644 --- a/docs/user-guide/tls.md +++ b/docs/user-guide/tls.md @@ -151,10 +151,10 @@ version to fully support Kube-Lego is nginx Ingress controller 0.8. ## Default TLS Version and Ciphers -To provide the most secure baseline configuration possible, nginx-ingress defaults to using TLS 1.2 and a [secure set of TLS ciphers](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/configmap.md#ssl-ciphers) +To provide the most secure baseline configuration possible, nginx-ingress defaults to using TLS 1.2 and a [secure set of TLS ciphers](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/configmap.md#ssl-ciphers) ## Legacy TLS -The default configuration, though secure, does not support some older browsers and operating systems. For instance, 20% of Android phones in use today are not compatible with nginx-ingress's default configuration. To change this default behavior, use a [ConfigMap](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/configmap.md#ssl-ciphers). +The default configuration, though secure, does not support some older browsers and operating systems. For instance, 20% of Android phones in use today are not compatible with nginx-ingress's default configuration. To change this default behavior, use a [ConfigMap](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/configmap.md#ssl-ciphers). A sample ConfigMap to allow these older clients connect could look something like the following: diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go index 162792d23..d126ea532 100644 --- a/internal/ingress/controller/config/config.go +++ b/internal/ingress/controller/config/config.go @@ -303,7 +303,7 @@ type Configuration struct { SSLECDHCurve string `json:"ssl-ecdh-curve,omitempty"` // The secret that contains Diffie-Hellman key to help with "Perfect Forward Secrecy" - // https://wiki.openssl.org/index.php/Manual:Dhparam(1) + // https://wiki.openssl.org/index.php/Diffie-Hellman_parameters // https://wiki.mozilla.org/Security/Server_Side_TLS#DHE_handshake_and_dhparam // http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_dhparam SSLDHParam string `json:"ssl-dh-param,omitempty"`