Repository: couchdb-documentation Updated Branches: refs/heads/master a7b3d28d1 -> a135f2fe8
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/a135f2fe Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/a135f2fe Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/a135f2fe Branch: refs/heads/master Commit: a135f2fe89f7b228b793aa2a8a62f0f34b576d8f Parents: a7b3d28 Author: Jan Lehnardt <j...@apache.org> Authored: Fri Sep 9 22:36:55 2016 +0200 Committer: Jan Lehnardt <j...@apache.org> Committed: Fri Sep 9 22:44:33 2016 +0200 ---------------------------------------------------------------------- src/cluster/setup.rst | 24 ++++++++++++++++-------- src/install/index.rst | 18 ++++++++++-------- src/whatsnew/2.0.rst | 2 +- 3 files changed, 27 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/a135f2fe/src/cluster/setup.rst ---------------------------------------------------------------------- diff --git a/src/cluster/setup.rst b/src/cluster/setup.rst index ffd9124..6b2c75b 100644 --- a/src/cluster/setup.rst +++ b/src/cluster/setup.rst @@ -154,11 +154,11 @@ Setting up a cluster of Erlang applications correctly can be a daunting task. Luckily, CouchDB 2.0 comes with a convenient Cluster Setup Wizard as part of the Fauxton web administration interface. -After installation and initial startup, visit Fauxton at +After installation and initial startup, visit Fauxton at ``http://127.0.0.01:5984/_utils#setup``. You will be asked to set up CouchDB as a single-node instance or set up a cluster. -When you click âsetup clusterâ on the other hand, you are asked for +When you click "setup cluster" on the other hand, you are asked for admin credentials again and then to add nodes by IP address. To get more nodes, go through the same install procedure on other machines. @@ -171,15 +171,23 @@ per node: curl -X PUT http://127.0.0.1:5984/_node/couchdb@<this-nodes-ip-address>/_config/admins/admin -d '"password"' curl -X PUT http://127.0.0.1:5984/_node/couchdb@<this-nodes-ip-address>/_config/chttpd/bind_address -d '"0.0.0.0"' -Now you can enter their IP addresses in the setup screen on your first node. And make sure to put in the admin username and password. And use the same admin username and password on all nodes. +Now you can enter their IP addresses in the setup screen on your first +node. And make sure to put in the admin username and password. And use +the same admin username and password on all nodes. -Once you added all nodes, click âSetupâ and Fauxton will finish the cluster configuration for you. +Once you added all nodes, click "Setup" and Fauxton will finish the +cluster configuration for you. -See http://127.0.0.1:5984/_membership to get a list of all the nodes in your cluster. +See http://127.0.0.1:5984/_membership to get a list of all the nodes in +your cluster. -Now your cluster is ready and available. You can send requests to any one of the nodes and get to all the data. +Now your cluster is ready and available. You can send requests to any +one of the nodes and get to all the data. -For a proper production setup, youâd now set up a HTTP proxy in front of the nodes, that does load balancing. We recommend `HAProxy`_. See our `example configuration for HAProxy`_. All you need is to adjust the ip addresses and ports. +For a proper production setup, you'd now set up a HTTP proxy in front +of the nodes, that does load balancing. We recommend `HAProxy`_. See +our `example configuration for HAProxy`_. All you need is to adjust the +ip addresses and ports. .. _HAProxy: http://haproxy.org/ -.. _example configuration for HAProxy: https://github.com/apache/couchdb/blob/master/rel/haproxy.cfg \ No newline at end of file +.. _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/a135f2fe/src/install/index.rst ---------------------------------------------------------------------- diff --git a/src/install/index.rst b/src/install/index.rst index 30afe83..5eb7ae9 100644 --- a/src/install/index.rst +++ b/src/install/index.rst @@ -30,12 +30,14 @@ Installation Single Node Setup ================= -CouchDB 2.0 can be used in a single-node and cluster setup configuration. A single-node CouchDB 2.0 installation is what most users -will be using. It is roughly equivalent to the CouchDB 1.x-series. Note -that a single-node setup obviously doesnât take any advantage of the -new scaling and fault-tolerance features in CouchDB 2.0. - -After installation and initial startup, visit Fauxton at +CouchDB 2.0 can be used in a single-node and cluster setup +configuration. A single-node CouchDB 2.0 installation is what most +users will be using. It is roughly equivalent to the CouchDB +1.x-series. Note that a single-node setup obviously doesn't take any +advantage of the new scaling and fault-tolerance features in CouchDB +2.0. + +After installation and initial startup, visit Fauxton at ``http://127.0.0.01:5984/_utils#setup``. You will be asked to set up CouchDB as a single-node instance or set up a cluster. @@ -44,7 +46,8 @@ username and password. Choose them well and remember them. You can also bind CouchDB to a public port, so it is accessible within your LAN or the public, if you are doing this on a public VM. -When you run 2.0 as a single node, it doesnât create system databases on startup. You have to do this manually: +When you run 2.0 as a single node, it doesn't create system databases +on startup. You have to do this manually: .. code-block:: shell @@ -56,7 +59,6 @@ When you run 2.0 as a single node, it doesnât create system databases on start See the next section for the cluster setup instructions. - Cluster Setup ============= http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/a135f2fe/src/whatsnew/2.0.rst ---------------------------------------------------------------------- diff --git a/src/whatsnew/2.0.rst b/src/whatsnew/2.0.rst index 142737e..0ceaf5e 100644 --- a/src/whatsnew/2.0.rst +++ b/src/whatsnew/2.0.rst @@ -54,7 +54,7 @@ Version 2.0.0 * :ref:`api/server/membership` shows all nodes in a cluster * ``/_bulk_get`` speeds up the replication protocol over low-latency connections - * ``/_node/`` api to access individual nodesâ configuration and compaction + * ``/_node/`` api to access individual nodes' configuration and compaction features * ``/_cluster_setup`` api to set up a cluster from scratch. * ``/_up`` api to signal health of a node to a load-balancer
