Repository: couchdb-documentation Updated Branches: refs/heads/master 77e679ce7 -> cd866be63
fix build Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/cd866be6 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/cd866be6 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/cd866be6 Branch: refs/heads/master Commit: cd866be6387efd11bc640715bba075ad2216d502 Parents: 77e679c Author: Garren Smith <garren.sm...@gmail.com> Authored: Wed Sep 21 15:51:52 2016 +0200 Committer: Garren Smith <garren.sm...@gmail.com> Committed: Wed Sep 21 15:51:52 2016 +0200 ---------------------------------------------------------------------- src/cluster/setup.rst | 18 +++++++++++------- src/install/unix.rst | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/cd866be6/src/cluster/setup.rst ---------------------------------------------------------------------- diff --git a/src/cluster/setup.rst b/src/cluster/setup.rst index ce3b123..6bea63a 100644 --- a/src/cluster/setup.rst +++ b/src/cluster/setup.rst @@ -203,19 +203,24 @@ setup the node: curl -X POST -H "Content-Type: application/json" http://admin:password@127.0.0.1:5984/_cluster_setup -d '{"action": "enable_cluster", "bind_address":"0.0.0.0", "username": "admin", "password":"password"}' -After that we can join all the nodes together. Choose one node as the "setup coordination node" to run all these commands on. +After that we can join all the nodes together. Choose one node +as the "setup coordination node" to run all these commands on. This is a "setup coordination node" that manages the setup and -requires all other nodes to be able to see it and vice versa. Setup wonât work with unavailable nodes. -The notion of "setup coordination node" will be gone once the setup is finished. From then onwards the cluster -will no longer have a "setup coordination node". To add a node run these two commands: +requires all other nodes to be able to see it and vice versa. +Setup will not work with unavailable nodes. +The notion of "setup coordination node" will be gone once the setup is finished. +From then onwards the cluster will no longer have a "setup coordination node". +To add a node run these two commands: .. code-block:: bash curl -X POST -H "Content-Type: application/json" http://admin:password@127.0.0.1:5984/_cluster_setup -d '{"action": "enable_cluster", "bind_address":"0.0.0.0", "username": "admin", "password":"password", "port": 15984, "remote_node": "<remote-node-ip>", "remote_current_user": "<remote-node-username>", "remote_current_password": "<remote-node-password>" }' curl -X POST -H "Content-Type: application/json" http://admin:password@127.0.0.1:5984/_cluster_setup -d '{"action": "add_node", "host":"<remote-node-ip>", "port": "<remote-node-port>", "username": "garren", "password":"password"}' -H "Content-Type: application/json" -This will join the two nodes together. Keep running the above commands for each node you want to add to the cluster. -Once this is done run the following command to complete the setup and add the missing databases: +This will join the two nodes together. +Keep running the above commands for each +node you want to add to the cluster. Once this is done run the +following command to complete the setup and add the missing databases: .. code-block:: bash @@ -223,6 +228,5 @@ Once this is done run the following command to complete the setup and add the mi You CouchDB cluster is now setup. - .. _HAProxy: http://haproxy.org/ .. _example configuration for HAProxy: https://github.com/apache/couchdb/blob/master/rel/haproxy.cfg http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/cd866be6/src/install/unix.rst ---------------------------------------------------------------------- diff --git a/src/install/unix.rst b/src/install/unix.rst index acb8bb2..59541ec 100644 --- a/src/install/unix.rst +++ b/src/install/unix.rst @@ -222,7 +222,7 @@ From here you should verify your installation by pointing your web browser to:: http://localhost:5984/_utils/verify_install.html -Finally, to configure your cluster see :ref: `_cluster/setup/wizard`. +Finally, to configure your cluster see :ref: `_cluster/setup/wizard`. Running as a Daemon ===================