Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
janl committed Sep 9, 2016
1 parent a7b3d28 commit a135f2f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 17 deletions.
24 changes: 16 additions & 8 deletions src/cluster/setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
.. _example configuration for HAProxy: https://github.com/apache/couchdb/blob/master/rel/haproxy.cfg
18 changes: 10 additions & 8 deletions src/install/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand All @@ -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
=============

Expand Down
2 changes: 1 addition & 1 deletion src/whatsnew/2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a135f2f

Please sign in to comment.