d11487268e
Merge remote-tracking branch 'origin/dev/v4.3.0' into resolve-conflict-v4.3.0-to-v5.0
2021-02-12 10:36:16 +01:00
12568c8c74
Merge pull request #4173 from zmstone/refactor-relocate-management-and-dashboard
...
refactor(proj): Move opensource apps to lib-opensource
2021-02-12 10:20:47 +01:00
23b66c0fd5
chore(rebar.config.erl): wildcard only one level for include dir
2021-02-11 17:22:20 +01:00
e7785a63ee
fix(scripts): update scripts to work with new lib-opensource dir
2021-02-11 17:22:20 +01:00
8f477e8411
refactor(proj): Move opensource apps to lib-opensource
...
One step closer for better code abstraction for opensorce vs enterprise
So far this relocation is to make opensource to enterprise merges
conflict free.
2021-02-11 16:45:05 +01:00
6f736a79b7
chore(script): Allow compare base to be a commit sha1 hash
2021-02-11 16:44:12 +01:00
507759b9f1
Revert "refactor(emqx_modules): Move modules config to app dir"
...
This reverts commit 9cae8784c0
2021-02-11 16:44:12 +01:00
7bf0097330
Merge pull request #4140 from HJianBo/unify_pgsql_conf
...
Refine the auth-pgsql SSL version configuration
2021-02-11 15:51:09 +08:00
2b4906b47d
Merge branch 'dev/v4.3.0' into unify_pgsql_conf
2021-02-11 15:50:43 +08:00
514c2c0af5
Merge pull request #4169 from zmstone/refactor-move-modules-config-to-emqx-modules-app
...
refactor(emqx_modules): Move modules config to app dir
2021-02-10 09:03:04 +01:00
e80959ea2f
Merge pull request #4165 from zmstone/chore-merge-enterprise-configs
...
chore(conf): merge enterprise configs
2021-02-10 08:27:56 +01:00
8bf763b72b
Merge pull request #4167 from zmstone/fix-tls-ensure-tls-config-integrity
...
fix(tls): Ensure tls config integrity
2021-02-10 08:26:46 +01:00
d74bb81ff1
chore(style): make elvis happy
2021-02-10 00:02:52 +01:00
9cae8784c0
refactor(emqx_modules): Move modules config to app dir
2021-02-10 00:02:52 +01:00
f000b6583c
fix(tls): Ensure tls config integrity
...
For default tsl version and ciphers, we try to use otp release number
to determin if we want to use tlsv1.3
For default configs, we try to porivde both tlsv1.3 and
ciphers in config (even for commented out configs)
2021-02-09 22:56:28 +01:00
5ebf94a50a
chore(config): One config
...
emqx.conf was split into small files for enterprise
which leads to merge difficulties
This commit merges back config into the same file.
2021-02-09 21:34:46 +01:00
2fa1d9d10b
Merge pull request #4168 from emqx/dev/v4.3.0
...
Auto-pull-request-on-2021-02-09
2021-02-09 21:28:09 +01:00
2852ac79d4
feat(tls): Add a tls lib module
...
emqx_tls_lib is added to help ensure integrity of tls version
and cipher options.
2021-02-09 21:20:26 +01:00
1f10160fa2
Merge pull request #4158 from zmstone/refactor-move-emqx-modules-to-extra-src-dir
...
refactor(emqx_modules): Move emqx_modules to lib-opensource
2021-02-09 14:48:38 +01:00
a2d3b413a6
Merge pull request #4151 from emqx/v4.3.0-to-v5.0-resolve-tls-config-conflicts
...
Auto-pull-request-on-2021-02-05
2021-02-09 14:02:46 +01:00
4756eb7e5f
Merge branch 'dev/v5.0' into v4.3.0-to-v5.0-resolve-tls-config-conflicts
2021-02-09 09:37:19 +01:00
353ceafbb6
fix(telemtry): report only in official version
2021-02-09 10:46:48 +08:00
e4d3702f15
feat(apps): Ensure emqx_modules started before dependent apps
...
emqx_management and emqx_telemetry calls emqx_modules APIs
2021-02-08 22:07:13 +01:00
7aff861f9b
refactor(emqx_modules): Move emqx_modules to lib-opensource
...
emqx_moduels for enterprise is refactored as a lib/plugin
in order to avoid merge conflicts, we make sure they can
co-exist in the same branch, because lib-opensource is compiled
in opensource project and lib-enterprise (to be added) is
compiled in enterprise project
2021-02-08 21:35:44 +01:00
f879e8e09b
Merge pull request #4159 from jovdipp/all-versions-ciphers-update-wss
...
fix(wss-ciphers): cross version ciphers for 1.3,1.2,1.1
2021-02-08 20:41:58 +01:00
6decc188e0
fix(wss-ciphers): cross version ciphers for 1.3,1.2,1.1
2021-02-08 20:29:17 +13:00
c463e12d36
Merge pull request #4154 from zmstone/chore-etc-delete-emqx.d
...
chore(etc): Delete etc/emqx.d
2021-02-06 21:56:49 +01:00
2dce719bc7
chore(etc): Delete etc/emqx.d
...
The files are duplicated in etc/
2021-02-06 21:25:16 +01:00
7c94a02bdd
Merge pull request #4134 from jovdipp/tlsv1.3-as-default
...
Tlsv1.3 as default
2021-02-05 21:33:03 +01:00
70a490114d
fix(rulesql): proc cassandra cql with apostrophes failed
2021-02-05 15:30:16 +08:00
145958a178
test(emqx-ct-helpers): version upgrade 1.3.5
2021-02-05 16:21:28 +13:00
90c02f1116
test(emqx_exporto): refactored ssl ciphers call for ct_helpers update
2021-02-05 16:21:28 +13:00
5e15e3add8
fix(default-config-tls-ciphers): TLS1.3 exclusive ciphers prepended to TLS1.1+TLS1.2 ciphers
2021-02-05 16:21:28 +13:00
6541c589ab
test(tls1.3): Tests for default ssl config, as well as specific tls versions ( 1.1, 1.2, 1.3 )
2021-02-05 16:21:28 +13:00
a2fa84255f
fix(rulesql): proc_sql_param_str incorrect with apostrophes #4135 ( #4137 )
2021-02-05 10:41:54 +08:00
55253f914c
Merge pull request #4149 from emqx/dev/v4.3.0
...
Auto-pull-request-on-2021-02-04
2021-02-04 23:17:10 +01:00
c30666ee26
fix(rule-engine): remove plugin_template ( #4146 )
...
chore(build): remove template plugin
The template plugin is intended to work as a standalone plugin
development template repo. Should not be in the umbrella
project.
2021-02-04 10:01:37 +01:00
aadd1ba11a
add shellcheck to ci ( #4126 )
...
* chore(shell): disable some shellcheck
* refactor(shell): fix shellcheck
* test(ci): add shellcheck
2021-02-04 16:51:48 +09:00
daa9648db5
chore(ci): delete the ssl version configuration
2021-02-04 15:33:25 +08:00
c3642c5c83
refactor(pgsql): set the default ssl version to tlsv1.3,tlsv1.2,tlsv1.1
2021-02-04 15:32:08 +08:00
045bc02ec9
test(ci): add proptests chekcing to the makefile
2021-02-04 14:22:17 +08:00
52c747ca6b
chore(cover): add coverall back
2021-02-04 14:22:17 +08:00
6dd833c0ac
docs: update contributing guidelines and add pr template
2021-02-03 18:21:41 +08:00
7f349d814e
test(ci): unify the pgsql confs
2021-02-03 17:03:16 +08:00
3e1b6394f2
Merge pull request #4131 from emqx/dev/v4.3.0
...
Auto-pull-request-on-2021-02-01
2021-02-02 20:05:43 +01:00
a310cd3278
chore(CI): update aws cli download url
2021-02-01 14:48:08 +08:00
6eff70a646
fix(rule-engine): reply 500 when update resource failed ( #4120 )
2021-02-01 09:47:08 +08:00
c3c28f4b72
feat(tls.13): tls1.3 ciphers set in .conf's
2021-01-31 18:38:34 +13:00
94e8a69a48
docs(typos): vefify -> verify
2021-01-31 17:27:08 +13:00
6c1129dc6a
Auto-pull-request-on-2021-01-29 ( #4114 )
...
* fix(share sub): fix the issue that the number of subscriptions dropped to 0 during the picking subscriber and caused a crash
* Connection Busy Alarms (#3992 )
feat(emqx_connection): improve port_busy alarm
* fix(emqx_connection): tune the congestion alarm params
* chore(deps): upgrade esockd to 5.7.5
* fix(appup): correct the appup file
2021-01-30 10:30:18 +08:00
Zaiming Shi