From 0eda65d06fa6a5c42ce49b8575be42f05797869d Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Tue, 9 Mar 2021 21:01:10 +0100 Subject: [PATCH] chore(config): emqx.conf segmentation This is to facilitate enterprise edition release script to slice up the files into smaller config files --- etc/emqx.conf | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/etc/emqx.conf b/etc/emqx.conf index 86cf50122..684a1d0f8 100644 --- a/etc/emqx.conf +++ b/etc/emqx.conf @@ -1,10 +1,8 @@ -##==================================================================== -## EMQ X Configuration R4.0 -##==================================================================== +## EMQ X Configuration 4.3 -##-------------------------------------------------------------------- -## Cluster -##-------------------------------------------------------------------- +## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments! + +## CONFIG_SECTION_BGN=cluster ================================================== ## Cluster name. ## @@ -173,6 +171,8 @@ cluster.autoclean = 5m ## Value: String ## cluster.k8s.namespace = default +## CONFIG_SECTION_END=cluster ================================================== + ##-------------------------------------------------------------------- ## Node ##-------------------------------------------------------------------- @@ -301,9 +301,8 @@ node.crash_dump = {{ platform_log_dir }}/crash.dump node.dist_listen_min = 6369 node.dist_listen_max = 6369 -##-------------------------------------------------------------------- -## RPC -##-------------------------------------------------------------------- +## CONFIG_SECTION_BGN=rpc ====================================================== + ## RPC Mode. ## ## Value: sync | async @@ -400,9 +399,9 @@ rpc.socket_recbuf = 1MB ## Value: Seconds rpc.socket_buffer = 1MB -##-------------------------------------------------------------------- -## Log -##-------------------------------------------------------------------- +## CONFIG_SECTION_END=rpc ====================================================== + +## CONFIG_SECTION_BGN=logger =================================================== ## Where to emit the logs. ## Enable the console (standard output) logs. @@ -571,6 +570,8 @@ log.rotation.count = 5 ## #log.burst_limit = 20000, 1s +## CONFIG_SECTION_END=logger =================================================== + ##-------------------------------------------------------------------- ## Authentication/Access Control ##-------------------------------------------------------------------- @@ -685,9 +686,7 @@ mqtt.strict_mode = false ## Value: String ## mqtt.response_information = example -##-------------------------------------------------------------------- -## Zones -##-------------------------------------------------------------------- +## CONFIG_SECTION_BGN=zones =================================================== ##-------------------------------------------------------------------- ## External Zone @@ -1021,9 +1020,9 @@ zone.internal.strict_mode = false ## Value: true | false zone.internal.bypass_auth_plugins = true -##-------------------------------------------------------------------- -## Listeners -##-------------------------------------------------------------------- +## CONFIG_SECTION_END=zones ==================================================== + +## CONFIG_SECTION_BGN=listeners ================================================ ##-------------------------------------------------------------------- ## MQTT/TCP - External TCP Listener for MQTT Protocol @@ -2048,9 +2047,10 @@ listener.wss.external.allow_origin_absence = true ## Value: http://url eg. https://localhost:8084, https://127.0.0.1:8084 listener.wss.external.check_origins = https://localhost:8084, https://127.0.0.1:8084 -##-------------------------------------------------------------------- -## Modules -##-------------------------------------------------------------------- +## CONFIG_SECTION_END=listeners ================================================ + +## CONFIG_SECTION_BGN=modules ================================================== + ## The file to store loaded module names. ## ## Value: File @@ -2177,9 +2177,9 @@ broker.shared_dispatch_ack_enabled = false ## Value: Flag broker.route_batch_clean = off -##-------------------------------------------------------------------- -## System Monitor -##-------------------------------------------------------------------- +## CONFIG_SECTION_END=modules ================================================== + +## CONFIG_SECTION_BGN=sys_mon ================================================== ## Enable Long GC monitoring. Disable if the value is 0. ## Notice: don't enable the monitor in production for: @@ -2326,4 +2326,6 @@ alarm.size_limit = 1000 ## Default: 24h alarm.validity_period = 24h +## CONFIG_SECTION_END=sys_mon ================================================== + {{ additional_configs }}