From ddc25be91536cbeb3b69e495edf0cb86a93b5bc4 Mon Sep 17 00:00:00 2001
From: GilbertWong <gilbertwong96@icloud.com>
Date: Tue, 30 Jul 2019 13:40:45 +0800
Subject: [PATCH] Rename node.proto_dist to cluster.proto_dist

---
 etc/emqx.conf    | 20 +++++++++++---------
 priv/emqx.schema | 14 ++++++++------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/etc/emqx.conf b/etc/emqx.conf
index df3be2a9a..97406b70b 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -11,6 +11,16 @@
 ## Value: String
 cluster.name = emqxcl
 
+## Specify the erlang distributed protocol.
+##
+## Value: Enum
+##  - inet_tcp: the default; handles TCP streams with IPv4 addressing.
+##  - inet6_tcp: handles TCP with IPv6 addressing.
+##  - inet_tls: using TLS for Erlang Distribution.
+##
+## vm.args: -proto_dist inet_tcp
+cluster.proto_dist = inet_tcp
+
 ## Cluster auto-discovery strategy.
 ##
 ## Value: Enum
@@ -251,15 +261,7 @@ node.fullsweep_after = 1000
 ## Value: Log file
 node.crash_dump = {{ platform_log_dir }}/crash.dump
 
-## Specify the erlang distributed protocol.
-##
-## Value: Enum
-##  - inet_tcp: the default; handles TCP streams with IPv4 addressing.
-##  - inet6_tcp: handles TCP with IPv6 addressing.
-##  - inet_tls: using TLS for Erlang Distribution.
-##
-## vm.args: -proto_dist inet_tcp
-node.proto_dist = inet_tcp
+
 
 ## Specify SSL Options in the file if using SSL for Erlang Distribution.
 ##
diff --git a/priv/emqx.schema b/priv/emqx.schema
index bbe3058f6..63cfdbd5d 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -85,6 +85,13 @@
   {datatype, string}
 ]}.
 
+%% @doc The erlang distributed protocol
+{mapping, "cluster.proto_dist", "ekka.proto_dist", [
+  {default, "inet_tcp"},
+  {datatype, {enum, [inet_tcp, inet6_tcp, inet_tls]}},
+  hidden
+]}.
+
 {mapping, "cluster.dns.app", "ekka.cluster_discovery", [
   {datatype, string}
 ]}.
@@ -198,12 +205,7 @@ end}.
   {default, "emqx@127.0.0.1"}
 ]}.
 
-%% @doc The erlang distributed protocol
-{mapping, "node.proto_dist", "ekka.proto_dist", [
-  %{default, "inet_tcp"},
-  {datatype, {enum, [inet_tcp, inet6_tcp, inet_tls]}},
-  hidden
-]}.
+
 
 %% @doc Specify SSL Options in the file if using SSL for erlang distribution
 {mapping, "node.ssl_dist_optfile", "vm_args.-ssl_dist_optfile", [