Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ erl_crash.dump
# rebar 2.x
.rebar
rel/example_project
ebin/*.beam
ebin/
deps

# rebar 3
Expand Down
2 changes: 1 addition & 1 deletion etc/emqx.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##====================================================================
## EMQ X Configuration v5.0
## EMQX Configuration v5.0
##====================================================================

listener.tcp {
Expand Down
14 changes: 7 additions & 7 deletions etc/emqx.cuttlefish.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## EMQ X Configuration 4.3
## EMQX Configuration 4.3

## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments!

Expand Down Expand Up @@ -1099,15 +1099,15 @@ 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/
##
## 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 received within the timeout.
##
## Value: Duration
Expand Down Expand Up @@ -1610,13 +1610,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
Expand Down Expand Up @@ -1879,13 +1879,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
Expand Down
2 changes: 1 addition & 1 deletion sample-schemas/emqx.schema
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%%-*- mode: erlang -*-
%% EMQ X R4.0 config mapping
%% EMQX R4.0 config mapping

%%--------------------------------------------------------------------
%% Cluster
Expand Down