Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix app config generation #2245

Merged
merged 2 commits into from Feb 21, 2019
Merged

Fix app config generation #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ae7afb
Fix etc/emqx.conf and priv/emqx.schema
gilbertwong96 Feb 21, 2019
5707b62
Delete unnecessary blank lines
gilbertwong96 Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
260 changes: 133 additions & 127 deletions etc/emqx.conf
View file
Open in desktop
Expand Up @@ -1591,47 +1591,25 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
##--------------------------------------------------------------------
## Bridges to aws
##--------------------------------------------------------------------
## Start type of the bridge.
##
## Value: enum
## manual
## auto
## bridge.aws.start_type = manual

## Bridge reconnect time.
##
## Value: Duration
## Default: 30 seconds
## bridge.aws.reconnect_interval = 30s

## Retry interval for bridge QoS1 message delivering.
##
## Value: Duration
## bridge.aws.retry_interval = 20s

## Inflight size.
##
## Value: Integer
## bridge.aws.max_inflight = 32

## Bridge address: node name for local bridge, host:port for remote.
##
## Value: String
## Example: emqx@127.0.0.1, 127.0.0.1:1883
## bridge.aws.address = 127.0.0.1:1883
bridge.aws.address = 127.0.0.1:1883

## Protocol version of the bridge.
##
## Value: Enum
## - mqttv5
## - mqttv4
## - mqttv3
## bridge.aws.proto_ver = mqttv4
bridge.aws.proto_ver = mqttv4

## The ClientId of a remote bridge.
##
## Value: String
## bridge.aws.client_id = bridge_aws
bridge.aws.client_id = bridge_aws

## The Clean start flag of a remote bridge.
##
Expand All @@ -1640,54 +1618,107 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
##
## NOTE: Some IoT platforms require clean_start
## must be set to 'true'
## bridge.aws.clean_start = true
bridge.aws.clean_start = true

## The username for a remote bridge.
##
## Value: String
## bridge.aws.username = user
bridge.aws.username = user

## The password for a remote bridge.
##
## Value: String
## bridge.aws.password = passwd
bridge.aws.password = passwd

## Mountpoint of the bridge.
##
## Value: String
## bridge.aws.mountpoint = bridge/aws/${node}/
bridge.aws.mountpoint = bridge/aws/${node}/

## Forward message topics
##
## Value: String
## Example: topic1/#,topic2/#
bridge.aws.forwards = topic1/#,topic2/#

## Bribge to remote server via SSL.
##
## Value: on | off
bridge.aws.ssl = off

## PEM-encoded CA certificates of the bridge.
##
## Value: File
bridge.aws.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem

## Client SSL Certfile of the bridge.
##
## Value: File
bridge.aws.certfile = {{ platform_etc_dir }}/certs/client-cert.pem

## Client SSL Keyfile of the bridge.
##
## Value: File
bridge.aws.keyfile = {{ platform_etc_dir }}/certs/client-key.pem

## SSL Ciphers used by the bridge.
##
## Value: String
bridge.aws.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384

## Ping interval of a down bridge.
##
## Value: Duration
## Default: 10 seconds
## bridge.aws.keepalive = 60s
bridge.aws.keepalive = 60s

## Forward message topics
## TLS versions used by the bridge.
##
## Value: String
## Example: topic1/#,topic2/#
## bridge.aws.forwards = topic1/#,topic2/#
bridge.aws.tls_versions = tlsv1.2,tlsv1.1,tlsv1

## Subscriptions of the bridge topic.
##
## Value: String
## bridge.aws.subscription.1.topic = cmd/topic1
bridge.aws.subscription.1.topic = cmd/topic1

## Subscriptions of the bridge qos.
##
## Value: Number
## bridge.aws.subscription.1.qos = 1
bridge.aws.subscription.1.qos = 1

## Subscriptions of the bridge topic.
##
## Value: String
## bridge.aws.subscription.2.topic = cmd/topic2
bridge.aws.subscription.2.topic = cmd/topic2

## Subscriptions of the bridge qos.
##
## Value: Number
## bridge.aws.subscription.2.qos = 1
bridge.aws.subscription.2.qos = 1

## Start type of the bridge.
##
## Value: enum
## manual
## auto
bridge.aws.start_type = manual

## Bridge reconnect time.
##
## Value: Duration
## Default: 30 seconds
bridge.aws.reconnect_interval = 30s

## Retry interval for bridge QoS1 message delivering.
##
## Value: Duration
bridge.aws.retry_interval = 20s

## Inflight size.
##
## Value: Integer
bridge.aws.max_inflight = 32

## Maximum number of messages in one batch when sending to remote borkers
## NOTE: when bridging via MQTT connection to remote broker, this config is only
Expand All @@ -1696,76 +1727,23 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
##
## Value: Integer
## default: 32
## bridge.aws.queue.batch_size = 32
bridge.aws.queue.batch_size = 32

## Base directory for replayq to store messages on disk
## If this config entry is missing or set to undefined,
## replayq works in a mem-only manner.
##
## Value: String
## bridge.aws.queue.replayq_dir = {{ platform_data_dir }}/emqx_aws_bridge/
bridge.aws.queue.replayq_dir = {{ platform_data_dir }}/emqx_aws_bridge/

## Replayq segment size
##
## Value: Bytesize

## bridge.aws.queue.replayq_seg_bytes = 10MB

## Bribge to remote server via SSL.
##
## Value: on | off
## bridge.aws.ssl = off

## PEM-encoded CA certificates of the bridge.
##
## Value: File
## bridge.aws.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem

## Client SSL Certfile of the bridge.
##
## Value: File
## bridge.aws.certfile = {{ platform_etc_dir }}/certs/client-cert.pem

## Client SSL Keyfile of the bridge.
##
## Value: File
## bridge.aws.keyfile = {{ platform_etc_dir }}/certs/client-key.pem

## SSL Ciphers used by the bridge.
##
## Value: String
## bridge.aws.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384

## TLS versions used by the bridge.
##
## Value: String
## bridge.aws.tls_versions = tlsv1.2,tlsv1.1,tlsv1
bridge.aws.queue.replayq_seg_bytes = 10MB

##--------------------------------------------------------------------
## Bridges to azure
##--------------------------------------------------------------------
## Start type of the bridge.
##
## Value: enum
## manual
## auto
## bridge.azure.start_type = manual

## Bridge reconnect count.
##
## Value: Number
## bridge.azure.reconnect_count = 10

## Bridge reconnect time.
##
## Value: Duration
## Default: 30 seconds
## bridge.azure.reconnect_time = 30s

## Retry interval for bridge QoS1 message delivering.
##
## Value: Duration
## bridge.azure.retry_interval = 20s

## Bridge address: node name for local bridge, host:port for remote.
##
Expand All @@ -1784,7 +1762,7 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
## The ClientId of a remote bridge.
##
## Value: String
## bridge.azure.client_id = bridge_azure
## bridge.azure.client_id = bridge_aws

## The Clean start flag of a remote bridge.
##
Expand All @@ -1808,24 +1786,54 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
## Mountpoint of the bridge.
##
## Value: String
## bridge.azure.mountpoint = bridge/azure/${node}/
## bridge.azure.mountpoint = bridge/aws/${node}/

## Forward message topics
##
## Value: String
## Example: topic1/#,topic2/#
## bridge.azure.forwards = topic1/#,topic2/#

## Bribge to remote server via SSL.
##
## Value: on | off
## bridge.azure.ssl = off

## PEM-encoded CA certificates of the bridge.
##
## Value: File
## bridge.azure.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem

## Client SSL Certfile of the bridge.
##
## Value: File
## bridge.azure.certfile = {{ platform_etc_dir }}/certs/client-cert.pem

## Client SSL Keyfile of the bridge.
##
## Value: File
## bridge.azure.keyfile = {{ platform_etc_dir }}/certs/client-key.pem

## SSL Ciphers used by the bridge.
##
## Value: String
## bridge.azure.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384

## Ping interval of a down bridge.
##
## Value: Duration
## Default: 10 seconds
## bridge.azure.keepalive = 10s
## bridge.azure.keepalive = 60s

## Forward message topics
## TLS versions used by the bridge.
##
## Value: String
## Example: topic1/#,topic2/#
## bridge.azure.forwards = topic1/#,topic2/#
## bridge.azure.tls_versions = tlsv1.2,tlsv1.1,tlsv1

## Subscriptions of the bridge topic.
##
## Value: String
## bridge.azure.subscription.1.topic = $share/cmd/topic1
## bridge.azure.subscription.1.topic = cmd/topic1

## Subscriptions of the bridge qos.
##
Expand All @@ -1835,13 +1843,36 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
## Subscriptions of the bridge topic.
##
## Value: String
## bridge.azure.subscription.2.topic = $share/cmd/topic2
## bridge.azure.subscription.2.topic = cmd/topic2

## Subscriptions of the bridge qos.
##
## Value: Number
## bridge.azure.subscription.2.qos = 1

## Start type of the bridge.
##
## Value: enum
## manual
## auto
## bridge.azure.start_type = manual

## Bridge reconnect time.
##
## Value: Duration
## Default: 30 seconds
## bridge.azure.reconnect_interval = 30s

## Retry interval for bridge QoS1 message delivering.
##
## Value: Duration
## bridge.azure.retry_interval = 20s

## Inflight size.
##
## Value: Integer
## bridge.azure.max_inflight = 32

## Maximum number of messages in one batch when sending to remote borkers
## NOTE: when bridging via MQTT connection to remote broker, this config is only
## used for internal message passing optimization as the underlying MQTT
Expand All @@ -1856,38 +1887,13 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
## replayq works in a mem-only manner.
##
## Value: String
## Default: ""
## bridge.azure.queue.replayq_dir = {{ platform_data_dir }}/emqx_azure.bridge/
## bridge.azure.queue.replayq_dir = {{ platform_data_dir }}/emqx_aws_bridge/

## Replayq segment size
##
## Value: Bytesize
## bridge.azure.queue.replayq_seg_bytes = 10MB

## PEM-encoded CA certificates of the bridge.
##
## Value: File
## bridge.azure.cacertfile = cacert.pem

## Client SSL Certfile of the bridge.
##
## Value: File
## bridge.azure.certfile = cert.pem

## Client SSL Keyfile of the bridge.
##
## Value: File
## bridge.azure.keyfile = key.pem

## SSL Ciphers used by the bridge.
##
## Value: String
## bridge.azure.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384

## TLS versions used by the bridge.
##
## Value: String
## bridge.azure.tls_versions = tlsv1.2,tlsv1.1,tlsv1

##--------------------------------------------------------------------
## Modules
Expand Down