This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit cc9aca59c4783691e35fd6213e5e67aa3b2d5d07
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Wed Nov 6 16:55:32 2019 +0700
JAMES-2905 Update documentation and template configurations
---
.../destination/conf/elasticsearch.properties | 15 +++++++++++++++
.../destination/conf/elasticsearch.properties | 15 +++++++++++++++
.../destination/conf/elasticsearch.properties | 15 +++++++++++++++
.../destination/conf/elasticsearch.properties | 15 +++++++++++++++
src/site/xdoc/server/config-elasticsearch.xml | 19 +++++++++++++++++++
5 files changed, 79 insertions(+)
diff --git
a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
b/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
index af93aa9..8302e15 100644
---
a/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
+++
b/dockerfiles/run/guice/cassandra-ldap/destination/conf/elasticsearch.properties
@@ -25,6 +25,21 @@
elasticsearch.masterHost=elasticsearch
elasticsearch.port=9200
+# Optional. Only http or https are accepted, default is http
+# elasticsearch.hostScheme=http
+
+# Optional.
+# Basic auth username to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.user=elasticsearch
+
+# Optional.
+# Basic auth password to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.password=secret
+
# You can alternatively provide a list of hosts following this format :
# elasticsearch.hosts=host1:9200,host2:9200
# elasticsearch.clusterName=cluster
diff --git
a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties
b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties
index 3c6d201..69c0eee 100644
---
a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties
+++
b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/destination/conf/elasticsearch.properties
@@ -24,6 +24,21 @@
elasticsearch.masterHost=elasticsearch
elasticsearch.port=9200
+# Optional. Only http or https are accepted, default is http
+# elasticsearch.hostScheme=http
+
+# Optional.
+# Basic auth username to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.user=elasticsearch
+
+# Optional.
+# Basic auth password to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.password=secret
+
# You can alternatively provide a list of hosts following this format :
# elasticsearch.hosts=host1:9200,host2:9200
# elasticsearch.clusterName=cluster
diff --git
a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties
b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties
index 3c6d201..69c0eee 100644
---
a/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties
+++
b/dockerfiles/run/guice/cassandra-rabbitmq/destination/conf/elasticsearch.properties
@@ -24,6 +24,21 @@
elasticsearch.masterHost=elasticsearch
elasticsearch.port=9200
+# Optional. Only http or https are accepted, default is http
+# elasticsearch.hostScheme=http
+
+# Optional.
+# Basic auth username to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.user=elasticsearch
+
+# Optional.
+# Basic auth password to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.password=secret
+
# You can alternatively provide a list of hosts following this format :
# elasticsearch.hosts=host1:9200,host2:9200
# elasticsearch.clusterName=cluster
diff --git
a/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
b/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
index af93aa9..8302e15 100644
--- a/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
+++ b/dockerfiles/run/guice/cassandra/destination/conf/elasticsearch.properties
@@ -25,6 +25,21 @@
elasticsearch.masterHost=elasticsearch
elasticsearch.port=9200
+# Optional. Only http or https are accepted, default is http
+# elasticsearch.hostScheme=http
+
+# Optional.
+# Basic auth username to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.user=elasticsearch
+
+# Optional.
+# Basic auth password to access elasticsearch.
+# Ignore elasticsearch.user and elasticsearch.password to not be using
authentication (default behaviour).
+# Otherwise, you need to specify both properties.
+# elasticsearch.password=secret
+
# You can alternatively provide a list of hosts following this format :
# elasticsearch.hosts=host1:9200,host2:9200
# elasticsearch.clusterName=cluster
diff --git a/src/site/xdoc/server/config-elasticsearch.xml
b/src/site/xdoc/server/config-elasticsearch.xml
index 0246aeb..b7a6213 100644
--- a/src/site/xdoc/server/config-elasticsearch.xml
+++ b/src/site/xdoc/server/config-elasticsearch.xml
@@ -38,6 +38,25 @@
<dd>Is the IP (or host) of the ElasticSearch master</dd>
<dt><strong>elasticsearch.port</strong></dt>
<dd>Is the port of ElasticSearch master</dd>
+
+ <dt><strong>elasticsearch.hostScheme</strong></dt>
+ <dd>Optional. Only http or https are accepted, default is http</dd>
+
+ <dt><strong>elasticsearch.user</strong></dt>
+ <dd>
+ Optional.
+ Basic auth username to access elasticsearch.
+ Ignore elasticsearch.user and elasticsearch.password to not be
using authentication (default behaviour).
+ Otherwise, you need to specify both properties.
+ </dd>
+
+ <dt><strong>elasticsearch.password</strong></dt>
+ <dd>
+ Optional.
+ Basic auth password to access elasticsearch.
+ Ignore elasticsearch.user and elasticsearch.password to not be
using authentication (default behaviour).
+ Otherwise, you need to specify both properties.
+ </dd>
</dl>
Or you can connect a cluster by :
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
