Commit Graph

120 Commits

Author SHA1 Message Date
Feng Lee
f4fd6efe16 Merge the emqx-common, emqx-router libraries 2018-02-26 23:29:53 +08:00
Feng Lee
057ef7b668 Merge branch 'master' 2018-02-26 01:05:08 +08:00
Feng Lee
fcb2ec8427 Merge the latest enterprise branch 2018-02-24 15:56:32 +08:00
Feng Lee
b63c34ab14 Merge the latest master branch 2018-02-24 11:27:09 +08:00
turtled
91b64813fa Modify tcp buffer config 2018-02-24 09:15:18 +08:00
turtled
a864aa9743 Modify tcp buffer config 2018-02-23 21:23:55 +08:00
Feng Lee
98d63a1454 Comment 'node.ssl_dist_optfile' option by default 2018-02-16 21:15:30 +08:00
Feng Lee
2674c145a9 Fix the 'inet_ssl' distribution module 2018-02-16 20:40:44 +08:00
Feng Lee
6c4ec45888 Add etc/ssl_dist.conf file to configure SSL distribution 2018-02-16 18:41:15 +08:00
Feng Lee
79902be40e Fix issue #1492 - add 'node.ssl_dist_optfile' to support ssl distributation 2018-02-16 18:40:03 +08:00
Feng Lee
bd0409879b Add 'proxy_port_address', 'proxy_port_header' options for WebSocket listener 2018-01-28 15:26:56 +08:00
Feng Lee
707d338b0e
Merge branch 'develop' into ws-proxy 2018-01-28 15:11:08 +08:00
Feng Lee
f70bf23440 Add 'listener.<proto>.<name>.reuseaddr' option 2018-01-24 09:48:06 +08:00
Feng Lee
94e1229abb Uncomment the 'node.proto_dist' to support docker env 2018-01-23 16:32:53 +08:00
Feng Lee
87ae76b6b4 Fix issue #1460 - Add node.proto_dist option to support inet6_dist 2018-01-23 15:22:05 +08:00
Feng Lee
a1cbdc5122 Update emq.conf and emq.schema 2018-01-12 10:46:35 +08:00
Feng Lee
a779c9f9cb Add 'listener.wss.external.tls_versions' option 2018-01-04 20:25:26 +08:00
Feng Lee
b98a320124 Improve documentation for all options 2018-01-04 15:32:21 +08:00
Feng Lee
b2b78c178c Add documenation for SSL configurations 2018-01-04 12:25:05 +08:00
Feng Lee
a17fae30e2 Add more documentation for MQTT listeners 2018-01-03 22:44:54 +08:00
Feng Lee
052f9638cb Add more documentation for emq.conf 2018-01-02 20:47:25 +08:00
Feng Lee
10ed4219db Update documentation for R2 configurations 2017-12-31 15:10:45 +08:00
Feng Lee
ed5e4d1857 Change the default value of mqtt.keepalive_backoff to 0.75 2017-12-27 21:30:17 +08:00
Feng Lee
bcec25092b Merge version 2.3.2 to X edition 2017-12-26 21:09:24 +08:00
Feng Lee
985ab723df Support for zone configuration 2017-12-26 21:01:03 +08:00
Feng Lee
d5222dcc9b Add proxy_protocol, proxy_protocol_timeout options for ws/wss 2017-12-25 20:38:09 +08:00
Feng Lee
db954aeb6d Support X.509 certificate based authentication with HAProxy 2017-12-15 19:23:50 +08:00
Feng Lee
f1640f5b85 Merge emq24 to X branch 2017-12-07 11:02:44 +08:00
Feng Lee
8e41aeeeb8 Add send_timeout, send_timeout_close options 2017-12-05 19:47:17 +08:00
turtled
a42fcb2c39 Fix conflicts 2017-12-05 16:34:18 +08:00
Feng Lee
bceb72853d Fix issue #1335 - Forward real client IP using a reverse proxy for websocket 2017-12-02 17:59:29 +08:00
Feng Lee
a5e06308e5
Merge pull request #1366 from HJianBo/ws_proxy
Websocket proxy configuration
2017-12-02 12:35:04 +08:00
Feng Lee
0716b2b2d0 Enable the stats of session by default 2017-12-02 12:13:55 +08:00
HeeeJianBo
5006dbba6e Add ws/wss proxy cofingurations for getting client original ip address 2017-12-01 22:12:27 +08:00
Feng Lee
2611f660de Fix issue #1353 - the management API should listen on 0.0.0:8080 2017-11-29 10:45:40 +08:00
Feng Lee
99ed0e46b6 Remove RPC args 2017-11-22 17:07:11 +08:00
Feng Lee
2cec86eba7 Merge with version 2.3.0 2017-11-21 14:14:12 +08:00
Feng Lee
1545e18cd9 Remove the 'mqtt.pubsub.by_clientid' option 2017-11-17 20:55:11 +08:00
turtled
f31485f342 Update openssl pem file 2017-11-02 22:01:26 +08:00
HuangDan
97cf04d752 Add more lager configuration 2017-10-11 16:01:39 +08:00
Feng Lee
2354a3dd5d Fix the building errors 2017-10-10 15:50:40 +08:00
turtled
989d2fd9e7 Add more lager configuration 2017-10-10 13:10:34 +08:00
Feng Lee
4b8cd18f5d Merge with EMQ X project 2017-10-09 19:43:06 +08:00
Feng Lee
88f84a4a0c Support to configure keepalive backoff 2017-08-07 18:27:16 +08:00
Feng Lee
09b4f17065 Merge the configuration of ekka 2017-07-23 18:42:54 +08:00
turtled
6350337d1d Set cluster.discovery default by mcast 2017-07-22 10:09:53 +08:00
Feng Lee
041b9100ed Merge configurations of ekka library 2017-07-21 12:52:26 +08:00
Feng Lee
8277707c1b node.dist_listen_max = 6379 2017-07-18 19:03:45 +08:00
Feng Lee
a23df7f16e Support autocluster with IP Multicast 2017-07-18 18:39:02 +08:00
Feng Lee
1ea630bc9e Integrate with ekka library 2017-06-28 16:51:19 +08:00