summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2016-01-25 13:04:09 +0000
committerDaniil Fedotov <dfedotov@pivotal.io>2016-01-28 15:49:05 +0000
commitebd48ed0e44cdeaa6987464f69243c2f202f8243 (patch)
tree0f21027a0a4db112e40e59d9a3f239cefee22234
parent3944d12a495ab77b5e9afc6e4ea44bf2e872ad90 (diff)
downloadrabbitmq-server-git-ebd48ed0e44cdeaa6987464f69243c2f202f8243.tar.gz
Testing schema
-rw-r--r--rabbitmq.conf.d/rabbitmq.conf18
-rw-r--r--schema/rabbitmq.config.schema4
2 files changed, 11 insertions, 11 deletions
diff --git a/rabbitmq.conf.d/rabbitmq.conf b/rabbitmq.conf.d/rabbitmq.conf
index 243353e77c..612006bb17 100644
--- a/rabbitmq.conf.d/rabbitmq.conf
+++ b/rabbitmq.conf.d/rabbitmq.conf
@@ -84,9 +84,9 @@ loopback_user.guest = guest
ssl_option.verify = verify_peer
ssl_option.fail_if_no_peer_cert = false
-ssl_option.cacertfile = /path/to/testca/cacert.pem
-ssl_option.certfile = /path/to/server/cert.pem
-ssl_option.keyfile = /path/to/server/key.pem
+#ssl_option.cacertfile = /path/to/testca/cacert.pem
+#ssl_option.certfile = /path/to/server/cert.pem
+#ssl_option.keyfile = /path/to/server/key.pem
## Choose the available SASL mechanism(s) to expose.
## The two default (built in) mechanisms are 'PLAIN' and
@@ -444,13 +444,13 @@ kernel.net_ticktime = 60
# Management section
# =======================================
-management.load_definitions = /path/to/schema.json
+#management.load_definitions = /path/to/schema.json
## Log all requests to the management HTTP API to a file.
##
## {http_log_dir, "/path/to/access.log"},
-management.http_log_dir = /path/to/access.log
+#management.http_log_dir = /path/to/access.log
## Change the port on which the HTTP listener listens,
## specifying an interface for the web server to bind to.
@@ -469,9 +469,9 @@ management.listener.port = 12345
management.listener.ip = 127.0.0.1
management.listener.ssl = true
-management.listener.ssl_opts.cacertfile = /path/to/cacert.pem
-management.listener.ssl_opts.certfile = /path/to/cert.pem
-management.listener.ssl_opts.keyfile = /path/to/key.pem
+#management.listener.ssl_opts.cacertfile = /path/to/cacert.pem
+#management.listener.ssl_opts.certfile = /path/to/cert.pem
+#management.listener.ssl_opts.keyfile = /path/to/key.pem
## One of 'basic', 'detailed' or 'none'. See
## http://www.rabbitmq.com/management.html#fine-stats for more details.
@@ -791,7 +791,7 @@ amqp1.protocol_strict_mode = false
# ]}
# ].
-log.dir = /var/log/rabbitmq
+#log.dir = /var/log/rabbitmq
log.console = false
log.console.level = info
diff --git a/schema/rabbitmq.config.schema b/schema/rabbitmq.config.schema
index 95d0bf3fb2..5c3e0c030b 100644
--- a/schema/rabbitmq.config.schema
+++ b/schema/rabbitmq.config.schema
@@ -632,7 +632,7 @@ end}.
{translation, "rabbit.cluster_partition_handling",
fun(Conf) ->
- case cuttlefish:get_value("cluster_partition_handling", Conf) of
+ case cuttlefish:conf_get("cluster_partition_handling", Conf) of
pause_if_all_down ->
PauseIfAllDownNodes = cuttlefish_variable:filter_by_prefix(
"cluster_partition_handling.pause_if_all_down.node",
@@ -642,7 +642,7 @@ fun(Conf) ->
cuttlefish:invalid("Nodes required for pause_if_all_down");
_ ->
Nodes = [ V || {K,V} <- PauseIfAllDownNodes ],
- PauseIfAllDownRecover = cuttlefish:get_value(
+ PauseIfAllDownRecover = cuttlefish:conf_get(
"cluster_partition_handling.pause_if_all_down.recover",
Conf),
case PauseIfAllDownRecover of