diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-01-28 15:42:23 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-01-28 15:49:05 +0000 |
| commit | 7cf3c35d6a0ea7ae2333750fb2b124b55745c749 (patch) | |
| tree | d7065dac13b51682c6ae85d501d2351cdca2eec7 | |
| parent | ebd48ed0e44cdeaa6987464f69243c2f202f8243 (diff) | |
| download | rabbitmq-server-git-7cf3c35d6a0ea7ae2333750fb2b124b55745c749.tar.gz | |
Fix config to start broker
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | rabbitmq.conf.d/rabbitmq.conf | 16 | ||||
| -rw-r--r-- | schema/rabbitmq.config.schema | 8 |
3 files changed, 15 insertions, 12 deletions
@@ -451,3 +451,6 @@ package-rpm-suse package-windows package-standalone-macosx \ package-generic-unix: $(PACKAGES_SOURCE_DIST_FILE) $(verbose) $(MAKE) -C packaging $@ \ SOURCE_DIST_FILE=$(abspath $(PACKAGES_SOURCE_DIST_FILE)) + +generate-config: + ./cuttlefish -e . -s ./schema -c rabbitmq.conf.d/rabbitmq.conf -f rabbitmq diff --git a/rabbitmq.conf.d/rabbitmq.conf b/rabbitmq.conf.d/rabbitmq.conf index 612006bb17..f42bc643b0 100644 --- a/rabbitmq.conf.d/rabbitmq.conf +++ b/rabbitmq.conf.d/rabbitmq.conf @@ -29,7 +29,7 @@ listener.tcp.default = 5672 ## {ssl_listeners, [5671]}, # SSL listeners are same -listener.ssl.default = 5672 +listener.ssl.default = 5671 ## Number of Erlang processes that will accept connections for the TCP @@ -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 = /Users/daniilfedotov/keys/rabbitmq.crt +ssl_option.certfile = /Users/daniilfedotov/keys/rabbitmq.crt +ssl_option.keyfile = /Users/daniilfedotov/keys/rabbitmq.key ## Choose the available SASL mechanism(s) to expose. ## The two default (built in) mechanisms are 'PLAIN' and @@ -342,10 +342,10 @@ mirroring_sync_batch_size = 4096 ## ## {cluster_nodes, {['rabbit@my.host.com'], disc}}, -cluster_nodes.disk.rabbit = rabbit@my.host.com +cluster_nodes.disc.rabbit = rabbit@my.host.com # Can define multiple -# cluster_nodes.disk.hare = hare@my.host.com +# cluster_nodes.disc.hare = hare@my.host.com # Ram nodes # Should not be defined together with disk nodes @@ -390,7 +390,7 @@ collect_statistics_interval = 5000 ## ## {hipe_compile, true}, -hipe_compile = true +hipe_compile = false ## Timeout used when waiting for Mnesia tables in a cluster to ## become available. @@ -799,7 +799,7 @@ log.console.level = info log.file = rabbit.log log.file.level = info -log.file.rotation.date = "" +log.file.rotation.date = '' log.file.rotation.size = 0 diff --git a/schema/rabbitmq.config.schema b/schema/rabbitmq.config.schema index 5c3e0c030b..4ac384bceb 100644 --- a/schema/rabbitmq.config.schema +++ b/schema/rabbitmq.config.schema @@ -129,7 +129,7 @@ end}. %% SSL options section ======================================================== -{mapping, "ssl_option.verify", "rabbit.ssl_options", [ +{mapping, "ssl_option.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", [ @@ -672,7 +672,7 @@ end}. %% %% {cluster_nodes, {['rabbit@my.host.com'], disc}}, -{mapping, "cluster_nodes.disk.$node", "rabbit.cluster_nodes", +{mapping, "cluster_nodes.disc.$node", "rabbit.cluster_nodes", [{datatype, atom}]}. {mapping, "cluster_nodes.ram.$node", "rabbit.cluster_nodes", @@ -680,11 +680,11 @@ end}. {translation, "rabbit.cluster_nodes", fun(Conf) -> - DiskNodes = [ V || {_, V} <- cuttlefish_variable:filter_by_prefix("cluster_nodes.disk", Conf)], + DiskNodes = [ V || {_, V} <- cuttlefish_variable:filter_by_prefix("cluster_nodes.disc", Conf)], RamNodes = [ V || {_, V} <- cuttlefish_variable:filter_by_prefix("cluster_nodes.ram", Conf)], case {DiskNodes, RamNodes} of - {_, []} -> {DiskNodes, disk}; + {_, []} -> {DiskNodes, disc}; {[], _} -> {RamNodes, ram} end end}. |