chore: rename more descriptive EQM X to EMQX
This commit is contained in:
parent
3be4f30f8c
commit
43c900bb5a
|
@ -12,11 +12,11 @@ assignees: tigercl
|
|||
|
||||
**Environment**:
|
||||
|
||||
- EMQ X version (e.g. `emqx_ctl status`):
|
||||
- EMQX version (e.g. `emqx_ctl status`):
|
||||
- Hardware configuration (e.g. `lscpu`):
|
||||
- OS (e.g. `cat /etc/os-release`):
|
||||
- Kernel (e.g. `uname -a`):
|
||||
- Erlang/OTP version (in case you build emqx from source code):
|
||||
- Erlang/OTP version (in case you build emqx from source code):
|
||||
- Others:
|
||||
|
||||
**What happened and what you expected to happen**:
|
||||
|
|
1
Makefile
1
Makefile
|
@ -7,7 +7,6 @@ export EMQX_RELUP ?= true
|
|||
export EMQX_DEFAULT_BUILDER = emqx/build-env:erl23.2.7.2-emqx-3-alpine
|
||||
export EMQX_DEFAULT_RUNNER = alpine:3.12
|
||||
export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
|
||||
export EMQX_DESC ?= EMQ X
|
||||
export EMQX_CE_DASHBOARD_VERSION ?= v4.3.5
|
||||
export DOCKERFILE := deploy/docker/Dockerfile
|
||||
ifeq ($(OS),Windows_NT)
|
||||
|
|
|
@ -168,7 +168,7 @@ auth.http.enable_pipelining = true
|
|||
|
||||
## If not specified, the server's names returned in server's certificate is validated against
|
||||
## what's provided `auth.http.auth_req.url` config's host part.
|
||||
## Setting to 'disable' will make EMQ X ignore unmatched server names.
|
||||
## Setting to 'disable' will make EMQX ignore unmatched server names.
|
||||
## If set with a host name, the server's names returned in server's certificate is validated
|
||||
## against this value.
|
||||
##
|
||||
|
|
|
@ -78,7 +78,7 @@ auth.mongo.database = mqtt
|
|||
|
||||
## If not specified, the server's names returned in server's certificate is validated against
|
||||
## what's provided `auth.mongo.server` config's host part.
|
||||
## Setting to 'disable' will make EMQ X ignore unmatched server names.
|
||||
## Setting to 'disable' will make EMQX ignore unmatched server names.
|
||||
## If set with a host name, the server's names returned in server's certificate is validated
|
||||
## against this value.
|
||||
##
|
||||
|
|
|
@ -123,7 +123,7 @@ auth.mysql.acl_query = select allow, ipaddr, username, clientid, access, topic f
|
|||
|
||||
## If not specified, the server's names returned in server's certificate is validated against
|
||||
## what's provided `auth.mysql.server` config's host part.
|
||||
## Setting to 'disable' will make EMQ X ignore unmatched server names.
|
||||
## Setting to 'disable' will make EMQX ignore unmatched server names.
|
||||
## If set with a host name, the server's names returned in server's certificate is validated
|
||||
## against this value.
|
||||
##
|
||||
|
|
|
@ -70,7 +70,7 @@ auth.pgsql.ssl = off
|
|||
|
||||
## If not specified, the server's names returned in server's certificate is validated against
|
||||
## what's provided `auth.pgsql.server` config's host part.
|
||||
## Setting to 'disable' will make EMQ X ignore unmatched server names.
|
||||
## Setting to 'disable' will make EMQX ignore unmatched server names.
|
||||
## If set with a host name, the server's names returned in server's certificate is validated
|
||||
## against this value.
|
||||
##
|
||||
|
|
|
@ -123,9 +123,9 @@ auth.redis.acl_cmd = HGETALL mqtt_acl:%u
|
|||
|
||||
## If not specified, the server's names returned in server's certificate is validated against
|
||||
## what's provided `auth.redis.server` config's host part.
|
||||
## Setting to 'disable' will make EMQ X ignore unmatched server names.
|
||||
## Setting to 'disable' will make EMQX ignore unmatched server names.
|
||||
## If set with a host name, the server's names returned in server's certificate is validated
|
||||
## against this value.
|
||||
##
|
||||
## Value: String | disable
|
||||
## auth.redis.ssl.server_name_indication = disable
|
||||
## auth.redis.ssl.server_name_indication = disable
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##====================================================================
|
||||
## Configuration for EMQ X MQTT Broker Bridge
|
||||
## Configuration for EMQX MQTT Broker Bridge
|
||||
##====================================================================
|
||||
|
||||
##--------------------------------------------------------------------
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##====================================================================
|
||||
## EMQ X Hooks
|
||||
## EMQX Hooks
|
||||
##====================================================================
|
||||
|
||||
## The default value or action will be returned, while the request to
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##====================================================================
|
||||
## EMQ X ExProto
|
||||
## EMQX ExProto
|
||||
##====================================================================
|
||||
|
||||
exproto.server.http.port = 9100
|
||||
|
@ -65,7 +65,7 @@ exproto.listener.protoname.idle_timeout = 30s
|
|||
## Example: allow 192.168.0.0/24
|
||||
exproto.listener.protoname.access.1 = allow all
|
||||
|
||||
## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
|
||||
## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
|
||||
## behind HAProxy or Nginx.
|
||||
##
|
||||
## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
|
||||
|
@ -73,7 +73,7 @@ exproto.listener.protoname.access.1 = allow all
|
|||
## Value: on | off
|
||||
## exproto.listener.protoname.proxy_protocol = on
|
||||
|
||||
## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
|
||||
## Sets the timeout for proxy protocol. EMQX will close the TCP connection
|
||||
## if no proxy protocol packet recevied within the timeout.
|
||||
##
|
||||
## Value: Duration
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
##--------------------------------------------------------------------
|
||||
## EMQ X Lua Hook
|
||||
## EMQX Lua Hook
|
||||
##--------------------------------------------------------------------
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##--------------------------------------------------------------------
|
||||
## EMQ X Management Plugin
|
||||
## EMQX Management Plugin
|
||||
##--------------------------------------------------------------------
|
||||
|
||||
## Max Row Limit
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##--------------------------------------------------------------------
|
||||
## EMQ X Management Plugin
|
||||
## EMQX Management Plugin
|
||||
##--------------------------------------------------------------------
|
||||
|
||||
## Max Row Limit
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##--------------------------------------------------------------------
|
||||
## emqx_prometheus for EMQ X
|
||||
## emqx_prometheus for EMQX
|
||||
##--------------------------------------------------------------------
|
||||
|
||||
## The Prometheus Push Gateway URL address
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##--------------------------------------------------------------------
|
||||
## EMQ X Retainer
|
||||
## EMQX Retainer
|
||||
##--------------------------------------------------------------------
|
||||
|
||||
## Where to store the retained messages.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##====================================================================
|
||||
## Rule Engine for EMQ X R4.0
|
||||
## EMQX Rule Engine
|
||||
##====================================================================
|
||||
|
||||
rule_engine.ignore_sys_message = on
|
||||
|
|
|
@ -45,7 +45,7 @@ web.hook.body.encoding_of_payload_field = plain
|
|||
|
||||
## If not specified, the server's names returned in server's certificate is validated against
|
||||
## what's provided `web.hook.url` config's host part.
|
||||
## Setting to 'disable' will make EMQ X ignore unmatched server names.
|
||||
## Setting to 'disable' will make EMQX ignore unmatched server names.
|
||||
## If set with a host name, the server's names returned in server's certificate is validated
|
||||
## against this value.
|
||||
##
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
%%-*- mode: erlang -*-
|
||||
%% EMQ X R3.0 config mapping
|
||||
%% EMQX config mapping
|
||||
|
||||
{mapping, "web.hook.url", "emqx_web_hook.url", [
|
||||
{datatype, string}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
## EMQ X Configuration 4.3
|
||||
## EMQX Configuration 4.3
|
||||
|
||||
## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments!
|
||||
|
||||
|
@ -203,10 +203,10 @@ node.data_dir = {{ platform_data_dir }}
|
|||
## the heartbeat pings.
|
||||
##
|
||||
## NOTE: When managed by systemd (or other supervision tools like systemd),
|
||||
## heart will probably only cause EMQ X to stop, but restart or not will
|
||||
## heart will probably only cause EMQX to stop, but restart or not will
|
||||
## depend on systemd's restart strategy.
|
||||
## NOTE: When running in docker, the container will die as soon as the the
|
||||
## heart process kills EMQ X, but restart or not will depend on container
|
||||
## heart process kills EMQX, but restart or not will depend on container
|
||||
## supervision strategy, such as k8s restartPolicy.
|
||||
##
|
||||
## Value: on
|
||||
|
@ -1118,7 +1118,7 @@ listener.tcp.external.zone = external
|
|||
## Example: allow 192.168.0.0/24
|
||||
listener.tcp.external.access.1 = allow all
|
||||
|
||||
## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
|
||||
## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
|
||||
## behind HAProxy or Nginx.
|
||||
##
|
||||
## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
|
||||
|
@ -1126,7 +1126,7 @@ listener.tcp.external.access.1 = allow all
|
|||
## Value: on | off
|
||||
## listener.tcp.external.proxy_protocol = on
|
||||
|
||||
## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
|
||||
## Sets the timeout for proxy protocol. EMQX will close the TCP connection
|
||||
## if no proxy protocol packet recevied within the timeout.
|
||||
##
|
||||
## Value: Duration
|
||||
|
@ -1629,13 +1629,13 @@ listener.ws.external.access.1 = allow all
|
|||
## Default: mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
|
||||
## listener.ws.external.supported_subprotocols = mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
|
||||
|
||||
## Specify which HTTP header for real source IP if the EMQ X cluster is
|
||||
## Specify which HTTP header for real source IP if the EMQX cluster is
|
||||
## deployed behind NGINX or HAProxy.
|
||||
##
|
||||
## Default: X-Forwarded-For
|
||||
## listener.ws.external.proxy_address_header = X-Forwarded-For
|
||||
|
||||
## Specify which HTTP header for real source port if the EMQ X cluster is
|
||||
## Specify which HTTP header for real source port if the EMQX cluster is
|
||||
## deployed behind NGINX or HAProxy.
|
||||
##
|
||||
## Default: X-Forwarded-Port
|
||||
|
@ -1898,13 +1898,13 @@ listener.wss.external.access.1 = allow all
|
|||
## Default: mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
|
||||
## listener.wss.external.supported_subprotocols = mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
|
||||
|
||||
## Specify which HTTP header for real source IP if the EMQ X cluster is
|
||||
## Specify which HTTP header for real source IP if the EMQX cluster is
|
||||
## deployed behind NGINX or HAProxy.
|
||||
##
|
||||
## Default: X-Forwarded-For
|
||||
## listener.wss.external.proxy_address_header = X-Forwarded-For
|
||||
|
||||
## Specify which HTTP header for real source port if the EMQ X cluster is
|
||||
## Specify which HTTP header for real source port if the EMQX cluster is
|
||||
## deployed behind NGINX or HAProxy.
|
||||
##
|
||||
## Default: X-Forwarded-Port
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
##--------------------------------------------------------------------
|
||||
## EMQ X Dashboard
|
||||
## EMQX Dashboard
|
||||
##--------------------------------------------------------------------
|
||||
|
||||
## Default user's login name.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
%%-*- mode: erlang -*-
|
||||
%% EMQ X R4.0 config mapping
|
||||
%% EMQX Config Mapping
|
||||
|
||||
%%--------------------------------------------------------------------
|
||||
%% Cluster
|
||||
|
|
Loading…
Reference in New Issue