summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2016-11-23 16:17:21 +0000
committerDaniil Fedotov <dfedotov@pivotal.io>2016-11-23 16:17:21 +0000
commit3542d80dfc102170c591639361d41288a853e3c7 (patch)
tree7bc03fa60098d0380edf5d95a41d44b41eded8cb /docs
parentc135b70c4690ddf3fdbafb9e0a8191cb2312eaae (diff)
parent90d640207e1f6d8d0956019fd799412677e8a965 (diff)
downloadrabbitmq-server-git-3542d80dfc102170c591639361d41288a853e3c7.tar.gz
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'docs')
-rw-r--r--docs/rabbitmq.conf.example12
1 files changed, 11 insertions, 1 deletions
diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example
index db65572c2a..33685191a3 100644
--- a/docs/rabbitmq.conf.example
+++ b/docs/rabbitmq.conf.example
@@ -307,14 +307,24 @@
## See http://www.rabbitmq.com/clustering.html#auto-config for
## further details.
##
+
+# autocluster.peer_discovery_backend = rabbit_peer_discovery_classic_config
+#
# autocluster.classic_config.nodes.node1 = rabbit1@hostname
# autocluster.classic_config.nodes.node2 = rabbit2@hostname
# autocluster.classic_config.nodes.node3 = rabbit3@hostname
# autocluster.classic_config.nodes.node4 = rabbit4@hostname
+## DNS-based peer discovery. This backend will list A records
+## of the configured hostname and perform reverse lookups for
+## the addresses returned.
+
+# autocluster.peer_discovery_backend = rabbit_peer_discovery_dns
+# autocluster.dns.hostname = rabbitmq.discovery.mycompany.local
+
## This node's type can be configured. If you are not sure
## what node type to use, always use 'disc'.
-# autocluster.classic_config.node_type = disc
+# autocluster.node_type = disc
## Interval (in milliseconds) at which we send keepalive messages
## to other cluster members. Note that this is not the same thing