none options for config collections

1 files changed, 34 insertions, 2 deletions

diff --git a/priv/schema/rabbitmq.schema b/priv/schema/rabbitmq.schema
index cdd37d7913..5f3230a6f7 100644
--- a/priv/schema/rabbitmq.schema
+++ b/priv/schema/rabbitmq.schema
@@ -94,14 +94,23 @@ end}.
 %% guest user from anywhere on the network.
 %% {loopback_users, []},
 
+{mapping, "loopback_users", "rabbit.loopback_users", [
+    {datatype, {enum, [none]}}
+]}.
+
 {mapping, "loopback_users.$user", "rabbit.loopback_users", [
     {datatype, atom}
 ]}.
 
 {translation, "rabbit.loopback_users",
 fun(Conf) ->
-    Settings = cuttlefish_variable:filter_by_prefix("loopback_users", Conf),
-    [ list_to_binary(U) || {["loopback_users", U], V} <- Settings, V == true ]
+    None = cuttlefish:conf_get("loopback_users", Conf),
+    case None of
+        none -> [];
+        _    ->
+            Settings = cuttlefish_variable:filter_by_prefix("loopback_users", Conf),
+            [ list_to_binary(U) || {["loopback_users", U], V} <- Settings, V == true ]
+    end
 end}.
 
 %% Configuring SSL.
@@ -115,6 +124,18 @@ end}.
 
 %% SSL options section ========================================================
 
+{mapping, "ssl_options", "rabbit.ssl_options", [
+    {datatype, {enum, [none]}}
+]}.
+
+{translation, "rabbit.ssl_options",
+fun(Conf) ->
+    case cuttlefish:conf_get("ssl_options", Conf) of
+        none -> [];
+        _    -> cuttlefish:invalid("Invalid ssl_options")
+    end
+end}.
+
 {mapping, "ssl_options.verify", "rabbit.ssl_options.verify", [
     {datatype, {enum, [verify_peer, verify_none]}}]}.
 
@@ -477,6 +498,17 @@ end}.
 
 %% TCP listener section ======================================================
 
+{mapping, "tcp_listen_options", "rabbit.tcp_listen_options", [
+    {datatype, {enum, [none]}}]}.
+
+{translation, "rabbit.tcp_listen_options", 
+fun(Conf) ->
+    case cuttlefish:conf_get("tcp_listen_options") of
+        none -> [];
+        _    -> cuttlefish:invalid("Invalid tcp_listen_options")
+    end
+end}.
+
 {mapping, "tcp_listen_options.backlog", "rabbit.tcp_listen_options.backlog", [
     {datatype, integer}
 ]}.