diff --git a/etc/emq.conf b/etc/emq.conf index 0bf53ebe7..e4434283a 100644 --- a/etc/emq.conf +++ b/etc/emq.conf @@ -211,7 +211,7 @@ 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.verify = verify_peer -## mqtt.listener.ssl.failed_if_no_peer_cert = true +## mqtt.listener.ssl.fail_if_no_peer_cert = true ## HTTP and WebSocket Listener mqtt.listener.http = 8083 @@ -227,7 +227,7 @@ mqtt.listener.http.max_clients = 64 ## mqtt.listener.https.keyfile = etc/certs/key.pem ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem ## mqtt.listener.https.verify = verify_peer -## mqtt.listener.https.failed_if_no_peer_cert = true +## mqtt.listener.https.fail_if_no_peer_cert = true ##------------------------------------------------------------------- ## System Monitor diff --git a/priv/emq.schema b/priv/emq.schema index 05a7209e5..2c73482ed 100644 --- a/priv/emq.schema +++ b/priv/emq.schema @@ -536,7 +536,7 @@ end}. {datatype, atom} ]}. -{mapping, "mqtt.listener.ssl.failed_if_no_peer_cert", "emqttd.listeners", [ +{mapping, "mqtt.listener.ssl.fail_if_no_peer_cert", "emqttd.listeners", [ {datatype, {enum, [true, false]}} ]}. @@ -592,7 +592,7 @@ end}. {datatype, atom} ]}. -{mapping, "mqtt.listener.https.failed_if_no_peer_cert", "emqttd.listeners", [ +{mapping, "mqtt.listener.https.fail_if_no_peer_cert", "emqttd.listeners", [ {datatype, {enum, [true, false]}} ]}. @@ -616,7 +616,7 @@ end}. {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, {verify, cuttlefish:conf_get(Prefix ++ ".verify", Conf, undefined)}, - {failed_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".failed_if_no_peer_cert", Conf, undefined)}]) + {fail_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".fail_if_no_peer_cert", Conf, undefined)}]) end, Listeners = fun(Name) when is_atom(Name) -> diff --git a/test/emqttd_SUITE_data/emqttd.conf b/test/emqttd_SUITE_data/emqttd.conf index 0bf53ebe7..e4434283a 100644 --- a/test/emqttd_SUITE_data/emqttd.conf +++ b/test/emqttd_SUITE_data/emqttd.conf @@ -211,7 +211,7 @@ 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.verify = verify_peer -## mqtt.listener.ssl.failed_if_no_peer_cert = true +## mqtt.listener.ssl.fail_if_no_peer_cert = true ## HTTP and WebSocket Listener mqtt.listener.http = 8083 @@ -227,7 +227,7 @@ mqtt.listener.http.max_clients = 64 ## mqtt.listener.https.keyfile = etc/certs/key.pem ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem ## mqtt.listener.https.verify = verify_peer -## mqtt.listener.https.failed_if_no_peer_cert = true +## mqtt.listener.https.fail_if_no_peer_cert = true ##------------------------------------------------------------------- ## System Monitor diff --git a/test/emqttd_SUITE_data/emqttd.schema b/test/emqttd_SUITE_data/emqttd.schema index 05a7209e5..2c73482ed 100644 --- a/test/emqttd_SUITE_data/emqttd.schema +++ b/test/emqttd_SUITE_data/emqttd.schema @@ -536,7 +536,7 @@ end}. {datatype, atom} ]}. -{mapping, "mqtt.listener.ssl.failed_if_no_peer_cert", "emqttd.listeners", [ +{mapping, "mqtt.listener.ssl.fail_if_no_peer_cert", "emqttd.listeners", [ {datatype, {enum, [true, false]}} ]}. @@ -592,7 +592,7 @@ end}. {datatype, atom} ]}. -{mapping, "mqtt.listener.https.failed_if_no_peer_cert", "emqttd.listeners", [ +{mapping, "mqtt.listener.https.fail_if_no_peer_cert", "emqttd.listeners", [ {datatype, {enum, [true, false]}} ]}. @@ -616,7 +616,7 @@ end}. {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, {verify, cuttlefish:conf_get(Prefix ++ ".verify", Conf, undefined)}, - {failed_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".failed_if_no_peer_cert", Conf, undefined)}]) + {fail_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".fail_if_no_peer_cert", Conf, undefined)}]) end, Listeners = fun(Name) when is_atom(Name) ->