Merge branch 'release-50' into 0522-merge-release-50-to-master

apps/emqx/include/emqx_release.hrl

@@ -35,7 +35,7 @@
 -define(EMQX_RELEASE_CE, "5.0.25").
 
 %% Enterprise edition
--define(EMQX_RELEASE_EE, "5.0.4-alpha.1").
+-define(EMQX_RELEASE_EE, "5.0.4-alpha.2").
 
 %% the HTTP API version
 -define(EMQX_API_VERSION, "5.0").

apps/emqx_eviction_agent/etc/emqx_eviction_agent.conf

@@ -1,3 +0,0 @@
-##--------------------------------------------------------------------
-## EMQX Eviction Agent Plugin
-##--------------------------------------------------------------------

apps/emqx_node_rebalance/etc/emqx_node_rebalance.conf

@@ -1,3 +0,0 @@
-##--------------------------------------------------------------------
-## EMQX Node Rebalance Plugin
-##--------------------------------------------------------------------

dev

@@ -323,10 +323,12 @@ boot() {
     ## Make erl command aware where to load all the beams
     ## this should be done before every erl command
     prepare_erl_libs "$PROFILE"
+    ## make sure copy acl.conf and certs to etc before render_hocon_conf
+    ## hocon will check rules inside acl.conf.
+    copy_other_conf_files
     render_hocon_conf
     generate_app_conf
     append_args_file
-    copy_other_conf_files
     APPS="$(apps_to_load)"
 
     BOOT_SEQUENCE="