You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/07/23 23:57:44 UTC
[couchdb-documentation] 12/18: put 2.x-relevant documentation
before 1.x-relevant documentation
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 2.2.0-release-notes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git
commit 2e551915fe80d9ccaf10ed53ca42ccf1906fa8c0
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Thu Jul 19 09:12:34 2018 +0200
put 2.x-relevant documentation before 1.x-relevant documentation
---
src/config/http.rst | 138 ++++++++++++++++++++++++++--------------------------
1 file changed, 69 insertions(+), 69 deletions(-)
diff --git a/src/config/http.rst b/src/config/http.rst
index 2d82d1c..80c0cfb 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -22,6 +22,75 @@ CouchDB HTTP Server
HTTP Server Options
===================
+.. config:section:: chttpd :: Clustered HTTP Server Options
+
+.. note::
+ In CouchDB 2.x, the `chttpd` section refers to the standard, clustered
+ port. All use of CouchDB, aside from a few specific maintenance tasks as
+ described in this documentation, should be performed over this port.
+
+ Defines the IP address by which the clustered port is available::
+
+ [chttpd]
+ bind_address = 127.0.0.1
+
+ To let CouchDB listen any available IP address, use `0.0.0.0`::
+
+ [chttpd]
+ bind_address = 0.0.0.0
+
+ For IPv6 support you need to set `::1` if you want to let CouchDB
+ listen correctly::
+
+ [chttpd]
+ bind_address = ::1
+
+ or `::` for any available::
+
+ [chttpd]
+ bind_address = ::
+
+ .. config:option:: port :: Listen port
+
+ Defines the port number to listen::
+
+ [chttpd]
+ port = 5984
+
+ To let CouchDB use any free port, set this option to `0`::
+
+ [chttpd]
+ port = 0
+
+ .. config:option:: prefer_minimal :: Sends minimal set of headers
+
+ If a request has the header `"Prefer": "return=minimal"`, CouchDB
+ will only send the headers that are listed for the `prefer_minimal`
+ configuration.::
+
+ [chttpd]
+ prefer_minimal = Cache-Control, Content-Length, Content-Range, Content-Type, ETag, Server, Transfer-Encoding, Vary
+
+ .. warning::
+ Removing the Server header from the settings will mean that
+ the CouchDB server header is replaced with the
+ MochiWeb server header.
+
+ .. config:option:: authentication_handlers :: Authentication handlers
+
+ List of authentication handlers used by CouchDB. You may
+ extend them via third-party plugins or remove some of them if you won't
+ let users to use one of provided methods::
+
+ [chttpd]
+ authentication_handlers = {chttpd_auth, cookie_authentication_handler}, {chttpd_auth, default_authentication_handler}
+
+ - ``{chttpd_auth, cookie_authentication_handler}``: used for Cookie auth;
+ - ``{couch_httpd_auth, proxy_authentication_handler}``: used for Proxy auth;
+ - ``{chttpd_auth, default_authentication_handler}``: used for Basic auth;
+ - ``{couch_httpd_auth, null_authentication_handler}``: disables auth.
+ Everlasting `Admin Party`!
+
.. config:section:: httpd :: HTTP Server Options
.. warning::
@@ -222,75 +291,6 @@ HTTP Server Options
upgrade, it is advisable to review the usage of these configuration
settings.
-.. config:section:: chttpd :: Clustered HTTP Server Options
-
-.. note::
- In CouchDB 2.x, the `chttpd` section refers to the standard, clustered
- port. All use of CouchDB, aside from a few specific maintenance tasks as
- described in this documentation, should be performed over this port.
-
- Defines the IP address by which the clustered port is available::
-
- [chttpd]
- bind_address = 127.0.0.1
-
- To let CouchDB listen any available IP address, use `0.0.0.0`::
-
- [chttpd]
- bind_address = 0.0.0.0
-
- For IPv6 support you need to set `::1` if you want to let CouchDB
- listen correctly::
-
- [chttpd]
- bind_address = ::1
-
- or `::` for any available::
-
- [chttpd]
- bind_address = ::
-
- .. config:option:: port :: Listen port
-
- Defines the port number to listen::
-
- [chttpd]
- port = 5984
-
- To let CouchDB use any free port, set this option to `0`::
-
- [chttpd]
- port = 0
-
- .. config:option:: prefer_minimal :: Sends minimal set of headers
-
- If a request has the header `"Prefer": "return=minimal"`, CouchDB
- will only send the headers that are listed for the `prefer_minimal`
- configuration.::
-
- [chttpd]
- prefer_minimal = Cache-Control, Content-Length, Content-Range, Content-Type, ETag, Server, Transfer-Encoding, Vary
-
- .. warning::
- Removing the Server header from the settings will mean that
- the CouchDB server header is replaced with the
- MochiWeb server header.
-
- .. config:option:: authentication_handlers :: Authentication handlers
-
- List of authentication handlers used by CouchDB. You may
- extend them via third-party plugins or remove some of them if you won't
- let users to use one of provided methods::
-
- [chttpd]
- authentication_handlers = {chttpd_auth, cookie_authentication_handler}, {chttpd_auth, default_authentication_handler}
-
- - ``{chttpd_auth, cookie_authentication_handler}``: used for Cookie auth;
- - ``{couch_httpd_auth, proxy_authentication_handler}``: used for Proxy auth;
- - ``{chttpd_auth, default_authentication_handler}``: used for Basic auth;
- - ``{couch_httpd_auth, null_authentication_handler}``: disables auth.
- Everlasting `Admin Party`!
-
.. _config/ssl:
Secure Socket Level Options