yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 'proxy_port_address', 'proxy_port_header' options for WebSocket listener

This commit is contained in:
Feng Lee 2018-01-28 15:26:56 +08:00
parent f810698d7e
commit bd0409879b
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etc/emq.conf
View File

@ -1084,9 +1084,17 @@ listener.ws.external.max_clients = 102400
## Value: ACL Rule ## Value: ACL Rule
listener.ws.external.access.1 = allow all listener.ws.external.access.1 = allow all
## listener.ws.external.proxy_address_header = x-forwarded-for ## Use X-Forwarded-For header for real source IP if the EMQ cluster is
## deployed behind NGINX or HAProxy.
##
## Value: String
## listener.ws.external.proxy_address_header = X-Forwarded-For
## listener.ws.external.proxy_port_header = x-remote-port ## Use X-Forwarded-Port header for real source port if the EMQ cluster is
## deployed behind NGINX or HAProxy.
##
## Value: String
## listener.ws.external.proxy_port_header = X-Forwarded-Port
## Enable the Proxy Protocol V1/2 if the EMQ cluster is deployed behind ## Enable the Proxy Protocol V1/2 if the EMQ cluster is deployed behind
## HAProxy or Nginx. ## HAProxy or Nginx.
@ -1204,9 +1212,15 @@ listener.wss.external.max_clients = 64
## Value: ACL Rule ## Value: ACL Rule
listener.wss.external.access.1 = allow all listener.wss.external.access.1 = allow all
## listener.wss.external.proxy_address_header = x-forwarded-for ## See: listener.ws.external.proxy_address_header
##
## Value: String
## listener.wss.external.proxy_address_header = X-Forwarded-For
## listener.wss.external.proxy_port_header = x-remote-port ## See: listener.ws.external.proxy_port_header
##
## Value: String
## listener.wss.external.proxy_port_header = X-Forwarded-Port
## Enable the Proxy Protocol V1/2 support. ## Enable the Proxy Protocol V1/2 support.
## ##

8
priv/emq.schema
View File

@ -1029,12 +1029,12 @@ end}.
{datatype, string} {datatype, string}
]}. ]}.
{mapping, "listener.ws.$name.proxy_port_header", "emqttd.listeners", [ {mapping, "listener.ws.$name.proxy_address_header", "emqttd.listeners", [
{datatype, string}, {datatype, string},
hidden hidden
]}. ]}.
{mapping, "listener.ws.$name.proxy_address_header", "emqttd.listeners", [ {mapping, "listener.ws.$name.proxy_port_header", "emqttd.listeners", [
{datatype, string}, {datatype, string},
hidden hidden
]}. ]}.
@ -1125,12 +1125,12 @@ end}.
{datatype, string} {datatype, string}
]}. ]}.
{mapping, "listener.wss.$name.proxy_port_header", "emqttd.listeners", [ {mapping, "listener.wss.$name.proxy_address_header", "emqttd.listeners", [
{datatype, string}, {datatype, string},
hidden hidden
]}. ]}.
{mapping, "listener.wss.$name.proxy_address_header", "emqttd.listeners", [ {mapping, "listener.wss.$name.proxy_port_header", "emqttd.listeners", [
{datatype, string}, {datatype, string},
hidden hidden
]}. ]}.