Skip to content

Commit

Permalink
Merge pull request #857 from emqtt/emq20
Browse files Browse the repository at this point in the history
Replace the 'runner_' variables with 'platform_'
  • Loading branch information
Feng Lee committed Jan 12, 2017
2 parents d62a374 + 72ed291 commit 448176c
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions etc/emq.conf
Expand Up @@ -39,7 +39,7 @@ node.max_ets_tables = 256000
node.fullsweep_after = 1000

## Crash dump
node.crash_dump = {{ runner_log_dir }}/crash.dump
node.crash_dump = {{ platform_log_dir }}/crash.dump

## Distributed node ticktime
node.dist_net_ticktime = 60
Expand All @@ -59,15 +59,15 @@ log.console = console
log.console.level = error

## Console log file
## log.console.file = {{ runner_log_dir }}/console.log
## log.console.file = {{ platform_log_dir }}/console.log

## Error log file
log.error.file = {{ runner_log_dir }}/error.log
log.error.file = {{ platform_log_dir }}/error.log

## Enable the crash log. Enum: on, off
log.crash = on

log.crash.file = {{ runner_log_dir }}/crash.log
log.crash.file = {{ platform_log_dir }}/crash.log

##--------------------------------------------------------------------
## MQTT Protocol
Expand All @@ -86,7 +86,7 @@ mqtt.client_idle_timeout = 30
mqtt.allow_anonymous = true

## Default ACL File
mqtt.acl_file = {{ runner_etc_dir }}/acl.conf
mqtt.acl_file = {{ platform_etc_dir }}/acl.conf

## Cache ACL for PUBLISH
mqtt.cache_acl = true
Expand Down Expand Up @@ -172,10 +172,10 @@ mqtt.bridge.ping_down_interval = 1
##-------------------------------------------------------------------

## Dir of plugins' config
mqtt.plugins.etc_dir ={{ runner_etc_dir }}/plugins/
mqtt.plugins.etc_dir ={{ platform_etc_dir }}/plugins/

## File to store loaded plugin names.
mqtt.plugins.loaded_file = {{ runner_data_dir }}/loaded_plugins
mqtt.plugins.loaded_file = {{ platform_data_dir }}/loaded_plugins

##--------------------------------------------------------------------
## MQTT Listeners
Expand Down Expand Up @@ -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 = {{ 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.keyfile = {{ platform_etc_dir }}/certs/key.pem
mqtt.listener.ssl.certfile = {{ platform_etc_dir }}/certs/cert.pem
## mqtt.listener.ssl.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem
## mqtt.listener.ssl.verify = verify_peer
## mqtt.listener.ssl.fail_if_no_peer_cert = true

Expand All @@ -231,9 +231,9 @@ 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 = {{ 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.keyfile = {{ platform_etc_dir }}/certs/key.pem
mqtt.listener.https.certfile = {{ platform_etc_dir }}/certs/cert.pem
## mqtt.listener.https.cacertfile = {{ platform_etc_dir }}/certs/cacert.pem

## mqtt.listener.https.verify = verify_peer
## mqtt.listener.https.fail_if_no_peer_cert = true
Expand Down

0 comments on commit 448176c

Please sign in to comment.