diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2018-07-02 14:37:36 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2018-07-03 21:11:50 +0900 |
| commit | 13f1d634d59ddec08b00cbc4ec298ac202852c9c (patch) | |
| tree | 1c95762fc98e43afeb7aa294483012776128247a | |
| parent | 975fdd285c892f9b26126e09c7877692da413b4a (diff) | |
config-gerrit: Move elasticsearch security settings to separate section
Change-Id: I59bf396b993968b1a311bd0509566a3b8cf7c286
| -rw-r--r-- | Documentation/config-gerrit.txt | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index d4671c5899..02fec24bb7 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -2809,6 +2809,26 @@ change index named `gerrit1_changes_0001`. + Not set by default. +[[elasticsearch.maxRetryTimeout]]elasticsearch.maxRetryTimeout:: ++ +Sets the maximum timeout to honor in case of multiple retries of the same request. ++ +The value is in the usual time-unit format like `1 m`, `5 m`. ++ +Defaults to `30000 ms`. + +==== Elasticsearch Security + +When security is enabled in Elasticsearch, the username and password must be provided. +Note that the same username and password are used for all servers. + +For further information about Elasticsearch security, please refer to the documentation: + +* link:https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/security.html[Elasticsearch 2.4] +* link:https://www.elastic.co/guide/en/x-pack/5.6/security-getting-started.html[Elasticsearch 5.6] +* link:https://www.elastic.co/guide/en/x-pack/6.2/security-getting-started.html[Elasticsearch 6.2] +* link:https://www.elastic.co/guide/en/elastic-stack-overview/6.3/security-getting-started.html[Elasticsearch 6.3] + [[elasticsearch.username]]elasticsearch.username:: + Username used to connect to Elasticsearch. @@ -2821,14 +2841,6 @@ Password used to connect to Elasticsearch. + Not set by default. -[[elasticsearch.maxRetryTimeout]]elasticsearch.maxRetryTimeout:: -+ -Sets the maximum timeout to honor in case of multiple retries of the same request. -+ -The value is in the usual time-unit format like `1 m`, `5 m`. -+ -Defaults to `30000 ms`. - ==== Elasticsearch server(s) configuration Each section corresponds to one Elasticsearch server. @@ -2851,7 +2863,6 @@ Elasticsearch server port. + Defaults to `9200`. - [[ldap]] === Section ldap |