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

Merge pull request #856 from emqtt/emq20 

Support variables in etc/emq.conf: {{ runner_etc_dir }}, {{ runner_etc_dir }}, {{ runner_data_dir }}
This commit is contained in:
turtleDeng 2017-01-12 11:20:00 +08:00 committed by GitHub
parent 0cd4afaa8e a5de6d0d1a
commit d62a374cc1
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etc/emq.conf
View File

@ -39,7 +39,7 @@ node.max_ets_tables = 256000
node.fullsweep_after = 1000
## Crash dump
node.crash_dump = log/crash.dump
node.crash_dump = {{ runner_log_dir }}/crash.dump
## Distributed node ticktime
node.dist_net_ticktime = 60
@ -59,15 +59,15 @@ log.console = console
log.console.level = error
## Console log file
## log.console.file = log/console.log
## log.console.file = {{ runner_log_dir }}/console.log
## Error log file
log.error.file = log/error.log
log.error.file = {{ runner_log_dir }}/error.log
## Enable the crash log. Enum: on, off
log.crash = on
log.crash.file = log/crash.log
log.crash.file = {{ runner_log_dir }}/crash.log
##--------------------------------------------------------------------
## MQTT Protocol
@ -86,7 +86,7 @@ mqtt.client_idle_timeout = 30
mqtt.allow_anonymous = true
## Default ACL File
mqtt.acl_file = etc/acl.conf
mqtt.acl_file = {{ runner_etc_dir }}/acl.conf
## Cache ACL for PUBLISH
mqtt.cache_acl = true
@ -172,10 +172,10 @@ mqtt.bridge.ping_down_interval = 1
##-------------------------------------------------------------------
## Dir of plugins' config
mqtt.plugins.etc_dir = etc/plugins/
mqtt.plugins.etc_dir ={{ runner_etc_dir }}/plugins/
## File to store loaded plugin names.
mqtt.plugins.loaded_file = data/loaded_plugins
mqtt.plugins.loaded_file = {{ runner_data_dir }}/loaded_plugins
##--------------------------------------------------------------------
## MQTT Listeners
@ -215,9 +215,9 @@ mqtt.listener.ssl.max_clients = 512
## Configuring SSL Options
## See http://erlang.org/doc/man/ssl.html
mqtt.listener.ssl.handshake_timeout = 15
mqtt.listener.ssl.keyfile = etc/certs/key.pem
mqtt.listener.ssl.certfile = etc/certs/cert.pem
## mqtt.listener.ssl.cacertfile = etc/certs/cacert.pem
mqtt.listener.ssl.keyfile = {{ runner_etc_dir }}/certs/key.pem
mqtt.listener.ssl.certfile = {{ runner_etc_dir }}/certs/cert.pem
## mqtt.listener.ssl.cacertfile = {{ runner_etc_dir }}/certs/cacert.pem
## mqtt.listener.ssl.verify = verify_peer
## mqtt.listener.ssl.fail_if_no_peer_cert = true
@ -231,9 +231,10 @@ mqtt.listener.https = 8084
mqtt.listener.https.acceptors = 4
mqtt.listener.https.max_clients = 64
mqtt.listener.https.handshake_timeout = 15
mqtt.listener.https.keyfile = etc/certs/key.pem
mqtt.listener.https.certfile = etc/certs/cert.pem
## mqtt.listener.https.cacertfile = etc/certs/cacert.pem
mqtt.listener.https.keyfile = {{ runner_etc_dir }}/certs/key.pem
mqtt.listener.https.certfile = {{ runner_etc_dir }}/certs/cert.pem
## mqtt.listener.https.cacertfile = {{ runner_etc_dir }}/certs/cacert.pem
## mqtt.listener.https.verify = verify_peer
## mqtt.listener.https.fail_if_no_peer_cert = true