From cc488199d9d23a88b6beb4b85b69d70bac18953d Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 6 Jul 2016 19:37:34 +0800 Subject: [PATCH 1/2] comment net.ipv4.tcp_tw_recycle --- docs/source/tune.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/source/tune.rst b/docs/source/tune.rst index 8cdc3c64a..4d0bb595f 100644 --- a/docs/source/tune.rst +++ b/docs/source/tune.rst @@ -72,8 +72,14 @@ Connection Tracking:: The TIME-WAIT Buckets Pool, Recycling and Reuse:: net.ipv4.tcp_max_tw_buckets=1048576 - net.ipv4.tcp_tw_recycle = 1 - net.ipv4.tcp_tw_reuse = 1 + + # Enable fast recycling of TIME_WAIT sockets. Enabling this + # option is not recommended for devices communicating with the + # general Internet or using NAT (Network Address Translation). + # Since some NAT gateways pass through IP timestamp values, one + # IP can appear to have non-increasing timestamps. + # net.ipv4.tcp_tw_recycle = 1 + # net.ipv4.tcp_tw_reuse = 1 Timeout for FIN-WAIT-2 sockets:: From 223c06fd6853df5dd7037581eba8c9a1a1a541d3 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Tue, 12 Jul 2016 17:36:23 +0800 Subject: [PATCH 2/2] fix ldap sslopts --- rel/files/emqttd.config.development | 4 ++-- rel/files/emqttd.config.production | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rel/files/emqttd.config.development b/rel/files/emqttd.config.development index 32424846b..8cec54f04 100644 --- a/rel/files/emqttd.config.development +++ b/rel/files/emqttd.config.development @@ -59,8 +59,8 @@ % {user_dn, "uid=$u,ou=People,dc=example,dc=com"}, % {ssl, fasle}, % {sslopts, [ - % {"certfile", "ssl.crt"}, - % {"keyfile", "ssl.key"}]} + % {certfile, "ssl.crt"}, + % {keyfile, "ssl.key"}]} % ]}, %% Allow all diff --git a/rel/files/emqttd.config.production b/rel/files/emqttd.config.production index 2748856bb..d41c9f0e9 100644 --- a/rel/files/emqttd.config.production +++ b/rel/files/emqttd.config.production @@ -51,8 +51,8 @@ % {user_dn, "uid=$u,ou=People,dc=example,dc=com"}, % {ssl, fasle}, % {sslopts, [ - % {"certfile", "ssl.crt"}, - % {"keyfile", "ssl.key"}]} + % {certfile, "ssl.crt"}, + % {keyfile, "ssl.key"}]} % ]}, %% Allow all