yuanbiao/emqx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,877 Commits 393 Branches 684 Tags 74 MiB
e4cb11fb43
Commit Graph

53 Commits

Author SHA1 Message Date
Zaiming Shi
5795bcca6a chore: fix app versions and check script 2021-06-05 11:09:13 +02:00
Zaiming Shi
d904a1048b Merge remote-tracking branch 'origin/master' into merge-master-to-dev/v5.0 2021-04-30 15:09:31 +02:00
Zaiming Shi
6354e75626 chore: update copyrights 2021-04-23 20:43:00 +02:00
z8674558
b0c3c713b5 Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-13 00:09:17 +09:00
JianBo He
16c999ed9b
Start emqx-modules application by default (#4518) 
* fix(modules): start emqx_modules by default

* chore(test): eliminate some compile warnings
 2021-04-12 09:45:31 +08:00
Zaiming Shi
b3b821e8c4 fix(flase): false 2021-04-08 00:34:43 +02:00
z8674558
490e6198ba fix(apps): typos on schema 2021-04-07 20:51:30 +09:00
z8674558
971e6ca90e Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-07 20:29:08 +09:00
JianBo He
f08ddec296
Add server_name_indication and verify option (#4349) 
Add server_name_indication and verify option
 2021-03-23 19:48:04 +08:00
zhanghongtong
99843e7b4b chore(auth plugins): remove emqx_modules in test case 2021-03-20 09:33:15 +08:00
Zaiming Shi
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
JianBo He
2b4906b47d
Merge branch 'dev/v4.3.0' into unify_pgsql_conf 2021-02-11 15:50:43 +08:00
Zaiming Shi
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
Zaiming Shi
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
Zaiming Shi
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
JianBo He
c3642c5c83 refactor(pgsql): set the default ssl version to tlsv1.3,tlsv1.2,tlsv1.1 2021-02-04 15:32:08 +08:00
z8674558
e8729fb00e Merge branch 'dev/v5.0' of private:emqx/emqx into merge430 2021-01-29 17:11:12 +09:00
wwhai
f0993c6b0f
chore(style): improve the codes style 2021-01-28 20:01:59 +08:00
zhanghongtong
6a83cf3f35 chore(format): format some code 2021-01-28 19:18:18 +08:00
Zaiming Shi
f42e52e84e fix(auth_pgsql): Add back econnrefused error clause 2021-01-27 19:10:47 +01:00
Zaiming Shi
20c37609af
Merge pull request #4062 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-01-24
 2021-01-24 22:29:09 +01:00
Zaiming Shi
5d45325cb8 fix(conf): quote config values 2021-01-22 14:20:47 +01:00
Zaiming Shi
b9071394c4 Merge remote-tracking branch 'origin/dev/v4.3.0' into chore-merge-v430-to-v50 2021-01-21 23:53:12 +01:00
Yudai Kiyofuji
455f210b4c
feat(cuttlefish): use hocon as a parsing function (#4008) 
* chore(conf): add quotation for hocon

* chore(conf): fix paths incompatible with hocon

* chore(conf): use hocon as parsing function

* chore(docker): add quotation to some env variables for hocon
 2021-01-19 19:52:17 +09:00
Zaiming Shi
be771f6cd9 fix(auth_pgsql): Make ssl_opts.versions backward compatible 2021-01-18 20:37:45 +01:00
Zaiming Shi
14ca914068 Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6 2021-01-18 20:37:26 +01:00
Zaiming Shi
a2b4e50a8d chore(sync-apps): re-sync apps from dev/v4.3.0 branch 2021-01-18 19:24:08 +01:00
wwhai
a6de90c3f9
fix(test): add two way ssl test (#4025) 2021-01-16 22:28:15 +08:00
zhanghongtong
9e03d6fea1 chore(auth): configuration format of unified authentication plug-in 2021-01-15 20:25:09 +08:00
bignullnull
981482d707
fix(test): fix test cases (#4012) 
* fix(test): fix test cases
 2021-01-15 09:48:57 +08:00
zhanghongtong
41afcde964 chore(ssl conf): update the ssl configuration format for mongo, pgsql, and redis plug-ins 2020-12-29 00:03:12 +08:00
zhanghongtong
6989c7a83d test(CI): add cts 2020-12-29 00:03:12 +08:00
Zaiming Shi
d60212787b chore(build): remove emqx from app's applications list 2020-12-12 23:02:26 +01:00
Shawn
10dbb5bc96
Fix testcases warns (#3906) 2020-12-11 18:54:48 +08:00
Zaiming Shi
7bdd093ef5 Merge remote-tracking branch 'origin/dev/v4.3.0' into umbrella-fix-build 2020-12-11 08:55:57 +01:00
Zaiming Shi
d75b89eadb chore(proj): sync .ci directories 2020-12-11 08:37:14 +01:00
Zaiming Shi
3a91ff8a7b chore(proj): resync apps 2020-12-11 08:19:26 +01:00
Ayodele
56d7b3deb1 Umbrella fix build (#8) 2020-12-10 11:25:25 +01:00
Ayodele
13b67c0d19 Umbrella fix build (#5) 
* fix(emqx_auth_jwt): Dialyzer warnings

* fix(emqx_auth_mnesia_cli): Dialyzer warnings

* fix(emqx_bridge_mqtt_cli): Dialyzer warnings

* fix(emqx_bridge_mqtt_cli): Dialyzer warnings

* fix(emqx_auth_redis_sup): Dialyzer warnings

* fix(emqx_bridge_mqtt): Dialyzer warnings

* fix(emqx_auth_pgsql_cli): Dialyzer warnings

* fix(emqx_bridge_mqtt_cli): Dialyzer warnings

* fix(emqx_auth_mnesia_cli): Dialyzer warnings
 2020-12-10 11:22:38 +01:00
Zaiming Shi
80e1d6cc9d chore(apps): delete LICENSE files for apps 2020-12-08 22:28:46 +01:00
Zaiming Shi
6d1cd6b7ea refactor(emqx_password): move the module to emqx application 
Future plugins will require emqx as a dependency.
This commit also brings back bcrypt to the system which was temporary
removed when converting to umbrella project
 2020-12-08 22:09:59 +01:00
Zaiming Shi
7fdbfba06a Merge branch 'umbrella-for-430-auto-sync' into umbrella-for-430 2020-12-08 22:09:59 +01:00
Zaiming Shi
2fda0a1565 chore(apps): Sync again all apps 2020-12-07 21:30:21 +01:00
Zaiming Shi
036eda27f6 chore(rebar): Delete profiles from apps' rebar.config 
otherwise rebar3 crashes
 2020-12-05 13:36:56 +01:00
Zaiming Shi
db792ec577 chore(apps): Sync again with 4.3.0 2020-12-05 03:02:35 +01:00
Zaiming Shi
8a12018863 Add more cleanups 2020-12-05 02:45:01 +01:00
Zaiming Shi
0fb5fb31a5 refactor(proj) sync 4.3.0 plugins with tracked files 2020-12-05 02:43:04 +01:00
Zaiming Shi
686c006d6e refactor(proj): Add apps 2020-12-04 22:11:53 +01:00
Zaiming Shi
73d02beace refactor(apps): Merge emqx_libs back to emqx 
And move emqx app back to root level

After realising the challenges of developing plugins in standalone
rebar projects. it is perhaps more smooth to keep using emqx as
a rebar dependency
 2020-12-04 19:58:58 +01:00
Zaiming Shi
2cbd2bc800 chore(app.src): use semver 4.3.0 for apps version base 2020-12-03 19:59:41 +01:00