Removed single to plural form mapping

1 files changed, 134 insertions, 117 deletions

diff --git a/scripts/rabbitmq.schema b/scripts/rabbitmq.schema
index 2700ad2e5e..b7663700cc 100644
--- a/scripts/rabbitmq.schema
+++ b/scripts/rabbitmq.schema
@@ -17,13 +17,13 @@
 %% {tcp_listeners, [{"127.0.0.1", 5672},
 %%                  {"::1",       5672}]},
 
-{mapping, "listener.tcp.$name", "rabbit.tcp_listeners",[
+{mapping, "listeners.tcp.$name", "rabbit.tcp_listeners",[
     {datatype, [integer, ip]}
 ]}.
 
 {translation, "rabbit.tcp_listeners",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("listener.tcp", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("listeners.tcp", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
@@ -32,13 +32,13 @@ end}.
 %%
 %% {ssl_listeners, [5671]},
 
-{mapping, "listener.ssl.$name", "rabbit.ssl_listeners",[
+{mapping, "listeners.ssl.$name", "rabbit.ssl_listeners",[
     {datatype, [integer, ip]}
 ]}.
 
 {translation, "rabbit.ssl_listeners",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("listener.ssl", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("listeners.ssl", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
@@ -94,14 +94,14 @@ end}.
 %% guest user from anywhere on the network.
 %% {loopback_users, []},
 
-{mapping, "loopback_user.$user", "rabbit.loopback_users", [
+{mapping, "loopback_users.$user", "rabbit.loopback_users", [
     {datatype, atom}
 ]}.
 
 {translation, "rabbit.loopback_users",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("loopback_user", Conf),
-    [ list_to_binary(U) || {["loopback_user", U], V} <- Settings, V == true ]
+    Settings = cuttlefish_variable:filter_by_prefix("loopback_users", Conf),
+    [ list_to_binary(U) || {["loopback_users", U], V} <- Settings, V == true ]
 end}.
 
 %% Configuring SSL.
@@ -115,99 +115,99 @@ end}.
 
 %% SSL options section ========================================================
 
-{mapping, "ssl_option.verify", "rabbit.ssl_options.verify", [
+{mapping, "ssl_options.verify", "rabbit.ssl_options.verify", [
     {datatype, {enum, [verify_peer, verify_none]}}]}.
 
-{mapping, "ssl_option.fail_if_no_peer_cert", "rabbit.ssl_options.fail_if_no_peer_cert", [
+{mapping, "ssl_options.fail_if_no_peer_cert", "rabbit.ssl_options.fail_if_no_peer_cert", [
     {datatype, {enum, [true, false]}}]}.
 
-{mapping, "ssl_option.cacertfile", "rabbit.ssl_options.cacertfile", 
+{mapping, "ssl_options.cacertfile", "rabbit.ssl_options.cacertfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "ssl_option.certfile", "rabbit.ssl_options.certfile", 
+{mapping, "ssl_options.certfile", "rabbit.ssl_options.certfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "ssl_option.cacerts.$name", "rabbit.ssl_options.cacerts", 
+{mapping, "ssl_options.cacerts.$name", "rabbit.ssl_options.cacerts", 
     [{datatype, string}]}.
 
 {translation, "rabbit.ssl_options.cacerts",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("ssl_option.cacerts", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("ssl_options.cacerts", Conf),
     [ list_to_binary(V) || {_, V} <- Settings ]
 end}.
 
-{mapping, "ssl_option.cert", "rabbit.ssl_options.cert", 
+{mapping, "ssl_options.cert", "rabbit.ssl_options.cert", 
     [{datatype, string}]}.
 
 {translation, "rabbit.ssl_options.cert",
 fun(Conf) ->
-    list_to_binary(cuttlefish:conf_get("ssl_option.cert", Conf))
+    list_to_binary(cuttlefish:conf_get("ssl_options.cert", Conf))
 end}.
 
-{mapping, "ssl_option.client_renegotiation", "rabbit.ssl_options.client_renegotiation", 
+{mapping, "ssl_options.client_renegotiation", "rabbit.ssl_options.client_renegotiation", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "ssl_option.crl_check", "rabbit.ssl_options.crl_check", 
+{mapping, "ssl_options.crl_check", "rabbit.ssl_options.crl_check", 
     [{datatype, [{enum, [true, false, peer, best_effort]}]}]}.
 
-{mapping, "ssl_option.depth", "rabbit.ssl_options.depth", 
+{mapping, "ssl_options.depth", "rabbit.ssl_options.depth", 
     [{datatype, integer}, {validators, ["byte"]}]}.
 
-{mapping, "ssl_option.dh", "rabbit.ssl_options.dh", 
+{mapping, "ssl_options.dh", "rabbit.ssl_options.dh", 
     [{datatype, string}]}.
 
 {translation, "rabbit.ssl_options.dh",
 fun(Conf) ->
-    list_to_binary(cuttlefish:conf_get("ssl_option.dh", Conf))
+    list_to_binary(cuttlefish:conf_get("ssl_options.dh", Conf))
 end}.
 
-{mapping, "ssl_option.dhfile", "rabbit.ssl_options.dhfile", 
+{mapping, "ssl_options.dhfile", "rabbit.ssl_options.dhfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "ssl_option.honor_cipher_order", "rabbit.ssl_options.honor_cipher_order", 
+{mapping, "ssl_options.honor_cipher_order", "rabbit.ssl_options.honor_cipher_order", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "ssl_option.key.RSAPrivateKey", "rabbit.ssl_options.key", 
+{mapping, "ssl_options.key.RSAPrivateKey", "rabbit.ssl_options.key", 
     [{datatype, string}]}.
 
-{mapping, "ssl_option.key.DSAPrivateKey", "rabbit.ssl_options.key", 
+{mapping, "ssl_options.key.DSAPrivateKey", "rabbit.ssl_options.key", 
     [{datatype, string}]}.
 
-{mapping, "ssl_option.key.PrivateKeyInfo", "rabbit.ssl_options.key", 
+{mapping, "ssl_options.key.PrivateKeyInfo", "rabbit.ssl_options.key", 
     [{datatype, string}]}.
 
 {translation, "rabbit.ssl_options.key",
 fun(Conf) ->
-    case cuttlefish_variable:filter_by_prefix("ssl_option.key", Conf) of
+    case cuttlefish_variable:filter_by_prefix("ssl_options.key", Conf) of
         [{[_,_,Key], Val}|_] -> {list_to_atom(Key), list_to_binary(Val)};
         _ -> undefined
     end
 end}.
 
-{mapping, "ssl_option.keyfile", "rabbit.ssl_options.keyfile", 
+{mapping, "ssl_options.keyfile", "rabbit.ssl_options.keyfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "ssl_option.log_alert", "rabbit.ssl_options.log_alert", 
+{mapping, "ssl_options.log_alert", "rabbit.ssl_options.log_alert", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "ssl_option.password", "rabbit.ssl_options.password", 
+{mapping, "ssl_options.password", "rabbit.ssl_options.password", 
     [{datatype, string}]}.
 
-{mapping, "ssl_option.psk_identity", "rabbit.ssl_options.psk_identity", 
+{mapping, "ssl_options.psk_identity", "rabbit.ssl_options.psk_identity", 
     [{datatype, string}]}.
 
-{mapping, "ssl_option.reuse_sessions", "rabbit.ssl_options.reuse_sessions", 
+{mapping, "ssl_options.reuse_sessions", "rabbit.ssl_options.reuse_sessions", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "ssl_option.secure_renegotiate", "rabbit.ssl_options.secure_renegotiate", 
+{mapping, "ssl_options.secure_renegotiate", "rabbit.ssl_options.secure_renegotiate", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "ssl_option.versions.$version", "rabbit.ssl_options.versions", 
+{mapping, "ssl_options.versions.$version", "rabbit.ssl_options.versions", 
     [{datatype, atom}]}.
 
 {translation, "rabbit.ssl_options.versions",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("ssl_option.cacerts", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("ssl_options.cacerts", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
@@ -222,12 +222,12 @@ end}.
 %%
 %% {auth_mechanisms, ['PLAIN', 'AMQPLAIN']},
 
-{mapping, "auth_mechanism.$name", "rabbit.auth_mechanisms", [
+{mapping, "auth_mechanisms.$name", "rabbit.auth_mechanisms", [
     {datatype, atom}]}.
 
 {translation, "rabbit.auth_mechanisms", 
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("auth_mechanism", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("auth_mechanisms", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
@@ -477,63 +477,63 @@ end}.
 
 %% TCP listener section ======================================================
 
-{mapping, "tcp_listen_option.backlog", "rabbit.tcp_listen_options.backlog", [
+{mapping, "tcp_listen_options.backlog", "rabbit.tcp_listen_options.backlog", [
     {datatype, integer}
 ]}.
 
-{mapping, "tcp_listen_option.nodelay", "rabbit.tcp_listen_options.nodelay", [
+{mapping, "tcp_listen_options.nodelay", "rabbit.tcp_listen_options.nodelay", [
     {datatype, {enum, [true, false]}}
 ]}.
 
-{mapping, "tcp_listen_option.buffer", "rabbit.tcp_listen_options.buffer", 
+{mapping, "tcp_listen_options.buffer", "rabbit.tcp_listen_options.buffer", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.delay_send", "rabbit.tcp_listen_options.delay_send", 
+{mapping, "tcp_listen_options.delay_send", "rabbit.tcp_listen_options.delay_send", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "tcp_listen_option.dontroute", "rabbit.tcp_listen_options.dontroute", 
+{mapping, "tcp_listen_options.dontroute", "rabbit.tcp_listen_options.dontroute", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "tcp_listen_option.exit_on_close", "rabbit.tcp_listen_options.exit_on_close", 
+{mapping, "tcp_listen_options.exit_on_close", "rabbit.tcp_listen_options.exit_on_close", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "tcp_listen_option.fd", "rabbit.tcp_listen_options.fd", 
+{mapping, "tcp_listen_options.fd", "rabbit.tcp_listen_options.fd", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.high_msgq_watermark", "rabbit.tcp_listen_options.high_msgq_watermark", 
+{mapping, "tcp_listen_options.high_msgq_watermark", "rabbit.tcp_listen_options.high_msgq_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.high_watermark", "rabbit.tcp_listen_options.high_watermark", 
+{mapping, "tcp_listen_options.high_watermark", "rabbit.tcp_listen_options.high_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.keepalive", "rabbit.tcp_listen_options.keepalive", 
+{mapping, "tcp_listen_options.keepalive", "rabbit.tcp_listen_options.keepalive", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "tcp_listen_option.low_msgq_watermark", "rabbit.tcp_listen_options.low_msgq_watermark", 
+{mapping, "tcp_listen_options.low_msgq_watermark", "rabbit.tcp_listen_options.low_msgq_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.low_watermark", "rabbit.tcp_listen_options.low_watermark", 
+{mapping, "tcp_listen_options.low_watermark", "rabbit.tcp_listen_options.low_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.port", "rabbit.tcp_listen_options.port", 
+{mapping, "tcp_listen_options.port", "rabbit.tcp_listen_options.port", 
     [{datatype, integer}, {validators, ["port"]}]}.
 
-{mapping, "tcp_listen_option.priority", "rabbit.tcp_listen_options.priority", 
+{mapping, "tcp_listen_options.priority", "rabbit.tcp_listen_options.priority", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.recbuf", "rabbit.tcp_listen_options.recbuf", 
+{mapping, "tcp_listen_options.recbuf", "rabbit.tcp_listen_options.recbuf", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.send_timeout", "rabbit.tcp_listen_options.send_timeout", 
+{mapping, "tcp_listen_options.send_timeout", "rabbit.tcp_listen_options.send_timeout", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.send_timeout_close", "rabbit.tcp_listen_options.send_timeout_close", 
+{mapping, "tcp_listen_options.send_timeout_close", "rabbit.tcp_listen_options.send_timeout_close", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "tcp_listen_option.sndbuf", "rabbit.tcp_listen_options.sndbuf", 
+{mapping, "tcp_listen_options.sndbuf", "rabbit.tcp_listen_options.sndbuf", 
     [{datatype, integer}]}.
 
-{mapping, "tcp_listen_option.tos", "rabbit.tcp_listen_options.tos", 
+{mapping, "tcp_listen_options.tos", "rabbit.tcp_listen_options.tos", 
     [{datatype, integer}]}.
 
 %% ==========================================================================
@@ -1124,112 +1124,112 @@ end}.
 %%                         {certfile,   "/path/to/cert.pem"},
 %%                         {keyfile,    "/path/to/key.pem"}]}]},
 
-{mapping, "management.listener.port", "rabbitmq_management.listener.port",
+{mapping, "management.listeners.port", "rabbitmq_management.listeners.port",
     [{datatype, integer}]}.
 
-{mapping, "management.listener.ip", "rabbitmq_management.listener.ip",
+{mapping, "management.listeners.ip", "rabbitmq_management.listeners.ip",
     [{datatype, string},
      {validators, ["is_ip"]}]}.
 
-{mapping, "management.listener.ssl", "rabbitmq_management.listener.ssl",
+{mapping, "management.listeners.ssl", "rabbitmq_management.listeners.ssl",
     [{datatype, {enum, [true, false]}}]}.
 
 
 %% SSL options section ========================================================
 
-{mapping, "management.listener.ssl_opts.verify", "rabbitmq_management.listener.ssl_opts.verify", [
+{mapping, "management.listeners.ssl_opts.verify", "rabbitmq_management.listeners.ssl_opts.verify", [
     {datatype, {enum, [verify_peer, verify_none]}}]}.
 
-{mapping, "management.listener.ssl_opts.fail_if_no_peer_cert", "rabbitmq_management.listener.ssl_opts.fail_if_no_peer_cert", [
+{mapping, "management.listeners.ssl_opts.fail_if_no_peer_cert", "rabbitmq_management.listeners.ssl_opts.fail_if_no_peer_cert", [
     {datatype, {enum, [true, false]}}]}.
 
-{mapping, "management.listener.ssl_opts.cacertfile", "rabbitmq_management.listener.ssl_opts.cacertfile", 
+{mapping, "management.listeners.ssl_opts.cacertfile", "rabbitmq_management.listeners.ssl_opts.cacertfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "management.listener.ssl_opts.certfile", "rabbitmq_management.listener.ssl_opts.certfile", 
+{mapping, "management.listeners.ssl_opts.certfile", "rabbitmq_management.listeners.ssl_opts.certfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "management.listener.ssl_opts.cacerts.$name", "rabbitmq_management.listener.ssl_opts.cacerts", 
+{mapping, "management.listeners.ssl_opts.cacerts.$name", "rabbitmq_management.listeners.ssl_opts.cacerts", 
     [{datatype, string}]}.
 
-{translation, "rabbitmq_management.listener.ssl_opts.cacerts",
+{translation, "rabbitmq_management.listeners.ssl_opts.cacerts",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("management.listener.ssl_opts.cacerts", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("management.listeners.ssl_opts.cacerts", Conf),
     [ list_to_binary(V) || {_, V} <- Settings ]
 end}.
 
-{mapping, "management.listener.ssl_opts.cert", "rabbitmq_management.listener.ssl_opts.cert", 
+{mapping, "management.listeners.ssl_opts.cert", "rabbitmq_management.listeners.ssl_opts.cert", 
     [{datatype, string}]}.
 
-{translation, "rabbitmq_management.listener.ssl_opts.cert",
+{translation, "rabbitmq_management.listeners.ssl_opts.cert",
 fun(Conf) ->
-    list_to_binary(cuttlefish:conf_get("management.listener.ssl_opts.cert", Conf))
+    list_to_binary(cuttlefish:conf_get("management.listeners.ssl_opts.cert", Conf))
 end}.
 
-{mapping, "management.listener.ssl_opts.client_renegotiation", "rabbitmq_management.listener.ssl_opts.client_renegotiation", 
+{mapping, "management.listeners.ssl_opts.client_renegotiation", "rabbitmq_management.listeners.ssl_opts.client_renegotiation", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "management.listener.ssl_opts.crl_check", "rabbitmq_management.listener.ssl_opts.crl_check", 
+{mapping, "management.listeners.ssl_opts.crl_check", "rabbitmq_management.listeners.ssl_opts.crl_check", 
     [{datatype, [{enum, [true, false, peer, best_effort]}]}]}.
 
-{mapping, "management.listener.ssl_opts.depth", "rabbitmq_management.listener.ssl_opts.depth", 
+{mapping, "management.listeners.ssl_opts.depth", "rabbitmq_management.listeners.ssl_opts.depth", 
     [{datatype, integer}, {validators, ["byte"]}]}.
 
-{mapping, "management.listener.ssl_opts.dh", "rabbitmq_management.listener.ssl_opts.dh", 
+{mapping, "management.listeners.ssl_opts.dh", "rabbitmq_management.listeners.ssl_opts.dh", 
     [{datatype, string}]}.
 
-{translation, "rabbitmq_management.listener.ssl_opts.dh",
+{translation, "rabbitmq_management.listeners.ssl_opts.dh",
 fun(Conf) ->
-    list_to_binary(cuttlefish:conf_get("management.listener.ssl_opts.dh", Conf))
+    list_to_binary(cuttlefish:conf_get("management.listeners.ssl_opts.dh", Conf))
 end}.
 
-{mapping, "management.listener.ssl_opts.dhfile", "rabbitmq_management.listener.ssl_opts.dhfile", 
+{mapping, "management.listeners.ssl_opts.dhfile", "rabbitmq_management.listeners.ssl_opts.dhfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "management.listener.ssl_opts.honor_cipher_order", "rabbitmq_management.listener.ssl_opts.honor_cipher_order", 
+{mapping, "management.listeners.ssl_opts.honor_cipher_order", "rabbitmq_management.listeners.ssl_opts.honor_cipher_order", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "management.listener.ssl_opts.key.RSAPrivateKey", "rabbitmq_management.listener.ssl_opts.key", 
+{mapping, "management.listeners.ssl_opts.key.RSAPrivateKey", "rabbitmq_management.listeners.ssl_opts.key", 
     [{datatype, string}]}.
 
-{mapping, "management.listener.ssl_opts.key.DSAPrivateKey", "rabbitmq_management.listener.ssl_opts.key", 
+{mapping, "management.listeners.ssl_opts.key.DSAPrivateKey", "rabbitmq_management.listeners.ssl_opts.key", 
     [{datatype, string}]}.
 
-{mapping, "management.listener.ssl_opts.key.PrivateKeyInfo", "rabbitmq_management.listener.ssl_opts.key", 
+{mapping, "management.listeners.ssl_opts.key.PrivateKeyInfo", "rabbitmq_management.listeners.ssl_opts.key", 
     [{datatype, string}]}.
 
-{translation, "rabbitmq_management.listener.ssl_opts.key",
+{translation, "rabbitmq_management.listeners.ssl_opts.key",
 fun(Conf) ->
-    case cuttlefish_variable:filter_by_prefix("management.listener.ssl_opts.key", Conf) of
+    case cuttlefish_variable:filter_by_prefix("management.listeners.ssl_opts.key", Conf) of
         [{[_,_,Key], Val}|_] -> {list_to_atom(Key), list_to_binary(Val)};
         _ -> undefined
     end
 end}.
 
-{mapping, "management.listener.ssl_opts.keyfile", "rabbitmq_management.listener.ssl_opts.keyfile", 
+{mapping, "management.listeners.ssl_opts.keyfile", "rabbitmq_management.listeners.ssl_opts.keyfile", 
     [{datatype, string}, {validators, ["file_accessible"]}]}.
 
-{mapping, "management.listener.ssl_opts.log_alert", "rabbitmq_management.listener.ssl_opts.log_alert", 
+{mapping, "management.listeners.ssl_opts.log_alert", "rabbitmq_management.listeners.ssl_opts.log_alert", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "management.listener.ssl_opts.password", "rabbitmq_management.listener.ssl_opts.password", 
+{mapping, "management.listeners.ssl_opts.password", "rabbitmq_management.listeners.ssl_opts.password", 
     [{datatype, string}]}.
 
-{mapping, "management.listener.ssl_opts.psk_identity", "rabbitmq_management.listener.ssl_opts.psk_identity", 
+{mapping, "management.listeners.ssl_opts.psk_identity", "rabbitmq_management.listeners.ssl_opts.psk_identity", 
     [{datatype, string}]}.
 
-{mapping, "management.listener.ssl_opts.reuse_sessions", "rabbitmq_management.listener.ssl_opts.reuse_sessions", 
+{mapping, "management.listeners.ssl_opts.reuse_sessions", "rabbitmq_management.listeners.ssl_opts.reuse_sessions", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "management.listener.ssl_opts.secure_renegotiate", "rabbitmq_management.listener.ssl_opts.secure_renegotiate", 
+{mapping, "management.listeners.ssl_opts.secure_renegotiate", "rabbitmq_management.listeners.ssl_opts.secure_renegotiate", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "management.listener.ssl_opts.versions.$version", "rabbitmq_management.listener.ssl_opts.versions", 
+{mapping, "management.listeners.ssl_opts.versions.$version", "rabbitmq_management.listeners.ssl_opts.versions", 
     [{datatype, atom}]}.
 
-{translation, "rabbitmq_management.listener.ssl_opts.versions",
+{translation, "rabbitmq_management.listeners.ssl_opts.versions",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("management.listener.ssl_opts.cacerts", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("management.listeners.ssl_opts.cacerts", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
@@ -1371,23 +1371,23 @@ end}.
 %% {tcp_listeners, [1883]},
 %% {ssl_listeners, []},
 
-{mapping, "mqtt.listener.tcp.$name", "rabbitmq_mqtt.tcp_listeners",[
+{mapping, "mqtt.listeners.tcp.$name", "rabbitmq_mqtt.tcp_listeners",[
     {datatype, [integer, ip]}
 ]}.
 
 {translation, "rabbitmq_mqtt.tcp_listeners",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("mqtt.listener.tcp", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("mqtt.listeners.tcp", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
-{mapping, "mqtt.listener.ssl.$name", "rabbitmq_mqtt.ssl_listeners",[
+{mapping, "mqtt.listeners.ssl.$name", "rabbitmq_mqtt.ssl_listeners",[
     {datatype, [integer, ip]}
 ]}.
 
 {translation, "rabbitmq_mqtt.ssl_listeners",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("mqtt.listener.ssl", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("mqtt.listeners.ssl", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
@@ -1415,63 +1415,63 @@ end}.
 
 %% TCP listener section ======================================================
 
-{mapping, "mqtt.tcp_listen_option.backlog", "rabbitmq_mqtt.tcp_listen_options.backlog", [
+{mapping, "mqtt.tcp_listen_options.backlog", "rabbitmq_mqtt.tcp_listen_options.backlog", [
     {datatype, integer}
 ]}.
 
-{mapping, "mqtt.tcp_listen_option.nodelay", "rabbitmq_mqtt.tcp_listen_options.nodelay", [
+{mapping, "mqtt.tcp_listen_options.nodelay", "rabbitmq_mqtt.tcp_listen_options.nodelay", [
     {datatype, {enum, [true, false]}}
 ]}.
 
-{mapping, "mqtt.tcp_listen_option.buffer", "rabbitmq_mqtt.tcp_listen_options.buffer", 
+{mapping, "mqtt.tcp_listen_options.buffer", "rabbitmq_mqtt.tcp_listen_options.buffer", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.delay_send", "rabbitmq_mqtt.tcp_listen_options.delay_send", 
+{mapping, "mqtt.tcp_listen_options.delay_send", "rabbitmq_mqtt.tcp_listen_options.delay_send", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "mqtt.tcp_listen_option.dontroute", "rabbitmq_mqtt.tcp_listen_options.dontroute", 
+{mapping, "mqtt.tcp_listen_options.dontroute", "rabbitmq_mqtt.tcp_listen_options.dontroute", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "mqtt.tcp_listen_option.exit_on_close", "rabbitmq_mqtt.tcp_listen_options.exit_on_close", 
+{mapping, "mqtt.tcp_listen_options.exit_on_close", "rabbitmq_mqtt.tcp_listen_options.exit_on_close", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "mqtt.tcp_listen_option.fd", "rabbitmq_mqtt.tcp_listen_options.fd", 
+{mapping, "mqtt.tcp_listen_options.fd", "rabbitmq_mqtt.tcp_listen_options.fd", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.high_msgq_watermark", "rabbitmq_mqtt.tcp_listen_options.high_msgq_watermark", 
+{mapping, "mqtt.tcp_listen_options.high_msgq_watermark", "rabbitmq_mqtt.tcp_listen_options.high_msgq_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.high_watermark", "rabbitmq_mqtt.tcp_listen_options.high_watermark", 
+{mapping, "mqtt.tcp_listen_options.high_watermark", "rabbitmq_mqtt.tcp_listen_options.high_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.keepalive", "rabbitmq_mqtt.tcp_listen_options.keepalive", 
+{mapping, "mqtt.tcp_listen_options.keepalive", "rabbitmq_mqtt.tcp_listen_options.keepalive", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "mqtt.tcp_listen_option.low_msgq_watermark", "rabbitmq_mqtt.tcp_listen_options.low_msgq_watermark", 
+{mapping, "mqtt.tcp_listen_options.low_msgq_watermark", "rabbitmq_mqtt.tcp_listen_options.low_msgq_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.low_watermark", "rabbitmq_mqtt.tcp_listen_options.low_watermark", 
+{mapping, "mqtt.tcp_listen_options.low_watermark", "rabbitmq_mqtt.tcp_listen_options.low_watermark", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.port", "rabbitmq_mqtt.tcp_listen_options.port", 
+{mapping, "mqtt.tcp_listen_options.port", "rabbitmq_mqtt.tcp_listen_options.port", 
     [{datatype, integer}, {validators, ["port"]}]}.
 
-{mapping, "mqtt.tcp_listen_option.priority", "rabbitmq_mqtt.tcp_listen_options.priority", 
+{mapping, "mqtt.tcp_listen_options.priority", "rabbitmq_mqtt.tcp_listen_options.priority", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.recbuf", "rabbitmq_mqtt.tcp_listen_options.recbuf", 
+{mapping, "mqtt.tcp_listen_options.recbuf", "rabbitmq_mqtt.tcp_listen_options.recbuf", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.send_timeout", "rabbitmq_mqtt.tcp_listen_options.send_timeout", 
+{mapping, "mqtt.tcp_listen_options.send_timeout", "rabbitmq_mqtt.tcp_listen_options.send_timeout", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.send_timeout_close", "rabbitmq_mqtt.tcp_listen_options.send_timeout_close", 
+{mapping, "mqtt.tcp_listen_options.send_timeout_close", "rabbitmq_mqtt.tcp_listen_options.send_timeout_close", 
     [{datatype, {enum, [true, false]}}]}.
 
-{mapping, "mqtt.tcp_listen_option.sndbuf", "rabbitmq_mqtt.tcp_listen_options.sndbuf", 
+{mapping, "mqtt.tcp_listen_options.sndbuf", "rabbitmq_mqtt.tcp_listen_options.sndbuf", 
     [{datatype, integer}]}.
 
-{mapping, "mqtt.tcp_listen_option.tos", "rabbitmq_mqtt.tcp_listen_options.tos", 
+{mapping, "mqtt.tcp_listen_options.tos", "rabbitmq_mqtt.tcp_listen_options.tos", 
     [{datatype, integer}]}.
 
 %% ==========================================================================
@@ -1488,23 +1488,23 @@ end}.
 %% {tcp_listeners, [{"127.0.0.1", 61613},
 %%                  {"::1",       61613}]},
 
-{mapping, "stomp.listener.tcp.$name", "rabbitmq_stomp.tcp_listeners",[
+{mapping, "stomp.listeners.tcp.$name", "rabbitmq_stomp.tcp_listeners",[
     {datatype, [integer, ip]}
 ]}.
 
 {translation, "rabbitmq_stomp.tcp_listeners",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("stomp.listener.tcp", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("stomp.listeners.tcp", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
-{mapping, "stomp.listener.ssl.$name", "rabbitmq_stomp.ssl_listeners",[
+{mapping, "stomp.listeners.ssl.$name", "rabbitmq_stomp.ssl_listeners",[
     {datatype, [integer, ip]}
 ]}.
 
 {translation, "rabbitmq_stomp.ssl_listeners",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("stomp.listener.ssl", Conf),
+    Settings = cuttlefish_variable:filter_by_prefix("stomp.listeners.ssl", Conf),
     [ V || {_, V} <- Settings ]
 end}.
 
@@ -1559,3 +1559,20 @@ end}.
 %   ]},
 {mapping, "stomp.implicit_connect", "rabbitmq_stomp.implicit_connect", 
     [{datatype, {enum, [true, false]}}]}.
+
+%% ==========================================================================
+%% ----------------------------------------------------------------------------
+%% RabbitMQ HTTP Authorization
+%%
+%% ----------------------------------------------------------------------------
+
+{mapping, "http.user_path", "rabbitmq_auth_backend_http.user_path", 
+    [{datatype, string}, {validators, ["uri"]}]}.
+
+{mapping, "http.vhost_path", "rabbitmq_auth_backend_http.vhost_path", 
+    [{datatype, string}, {validators, ["uri"]}]}.
+
+{mapping, "http.resource_path", "rabbitmq_auth_backend_http.resource_path", 
+    [{datatype, string}, {validators, ["uri"]}]}.
+
+