diff --git a/apps/emqx_conf/i18n/emqx_conf_schema.conf b/apps/emqx_conf/i18n/emqx_conf_schema.conf index edef14a9c..d0d08cb55 100644 --- a/apps/emqx_conf/i18n/emqx_conf_schema.conf +++ b/apps/emqx_conf/i18n/emqx_conf_schema.conf @@ -245,11 +245,12 @@ Note: probe messages are broadcast to all the specified ports. cluster_dns_name { desc { - en: """The domain name of the EMQX cluster.""" - zh: """指定 DNS A 记录的名字。emqx 会通过访问这个 DNS A 记录来获取 IP 地址列表, -然后拼接 cluster.dns.app 里指定的 APP 名得到集群中所有节点的列表。 -当 cluster.discovery_strategy 为 dns 时,此配置项才有效。 - """ + en: """The domain name from which to discover peer EMQX nodes' IP addresses. +Applicable when cluster.discovery_strategy = dns +""" + zh: """指定 DNS A 记录的名字。emqx 会通过访问这个 DNS A 记录来获取 IP 地址列表。 +当cluster.discovery_strategydns 时有效。 +""" } label { en: "Cluster Dns Name" @@ -257,19 +258,6 @@ Note: probe messages are broadcast to all the specified ports. } } - cluster_dns_app { - desc { - en: """The symbolic name of the EMQX service.""" - zh: """用来与从 cluster.dns.name 获取的 IP 列表拼接得到节点名列表。 -当 cluster.discovery_strategy 为 dns 时,此配置项才有效。 - """ - } - label { - en: "Cluster DNS App" - zh: "DNS前缀标识" - } - } - cluster_etcd_server { desc { en: """List of endpoint URLs of the etcd cluster""" diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index ce4d112ac..7960eba7f 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/apps/emqx_conf/src/emqx_conf_schema.erl @@ -288,15 +288,6 @@ fields(cluster_dns) -> 'readOnly' => true } )}, - {"app", - sc( - string(), - #{ - default => "emqx", - desc => ?DESC(cluster_dns_app), - 'readOnly' => true - } - )} ]; fields(cluster_etcd) -> [ @@ -1291,8 +1282,7 @@ options(mcast, Conf) -> ]; options(dns, Conf) -> [ - {name, conf_get("cluster.dns.name", Conf)}, - {app, conf_get("cluster.dns.app", Conf)} + {name, conf_get("cluster.dns.name", Conf)} ]; options(etcd, Conf) -> Namespace = "cluster.etcd.ssl",