You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2017/10/20 14:27:47 UTC

incubator-unomi git commit: Clarify ElasticSearch version requirements for master and 1.2 versions of Apache Unomi.

Repository: incubator-unomi
Updated Branches:
  refs/heads/master b190a4f77 -> faa9175ca


Clarify ElasticSearch version requirements for master and 1.2 versions of Apache Unomi.

Signed-off-by: Serge Huber <sh...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/faa9175c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/faa9175c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/faa9175c

Branch: refs/heads/master
Commit: faa9175ca785c74c5bc46ebb3ebe46a433489f16
Parents: b190a4f
Author: Serge Huber <sh...@apache.org>
Authored: Fri Oct 20 16:27:32 2017 +0200
Committer: Serge Huber <sh...@apache.org>
Committed: Fri Oct 20 16:27:41 2017 +0200

----------------------------------------------------------------------
 .../versions/1.2/building-and-deploying.md      | 24 +++++++++++++-------
 .../versions/master/building-and-deploying.md   |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/faa9175c/src/site/markdown/versions/1.2/building-and-deploying.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/1.2/building-and-deploying.md b/src/site/markdown/versions/1.2/building-and-deploying.md
index f4fbfb8..f5a2fb2 100644
--- a/src/site/markdown/versions/1.2/building-and-deploying.md
+++ b/src/site/markdown/versions/1.2/building-and-deploying.md
@@ -56,18 +56,26 @@ Installing an ElasticSearch server
 Starting with version 1.2, Apache Unomi no longer embeds an ElasticSearch server as this is no longer supported by 
 the developers of ElasticSearch. Therefore you will need to install a standalone ElasticSearch using the following steps:
 
-1. Download an ElasticSearch 5.x version (5.1.1 or more recent, but not 6.x) from the following site:
+1. Download an ElasticSearch version. Here's the version you will need depending
+on your version of Apache Unomi.
 
-    https://www.elastic.co/downloads/elasticsearch
-    
-2. Uncompress the downloaded package into a directory and launch the server using
+    Apache Unomi <= 1.2 : [https://www.elastic.co/downloads/past-releases/elasticsearch-5-1-2](https://www.elastic.co/downloads/past-releases/elasticsearch-5-1-2)    
+    Apache Unomi >= 1.3 : [https://www.elastic.co/downloads/past-releases/elasticsearch-5-6-3](https://www.elastic.co/downloads/past-releases/elasticsearch-5-6-3)
+        
+2. Uncompress the downloaded package into a directory
+
+3. In the config/elasticsearch.yml file, uncomment and modify the following line :
 
-    bin/elasticsearch (Mac, Linux)
-    bin\elasticsearch.bat (Windows)
+        cluster.name: contextElasticSearch
     
-3. Check that the ElasticSearch is up and running by accessing the following URL : 
+4. Launch the server using
+
+        bin/elasticsearch (Mac, Linux)
+        bin\elasticsearch.bat (Windows)
+
+5. Check that the ElasticSearch is up and running by accessing the following URL : 
 
-    http://localhost:9200    
+    [http://localhost:9200](http://localhost:9200)    
 
 Deploying the generated binary package
 --------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/faa9175c/src/site/markdown/versions/master/building-and-deploying.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/versions/master/building-and-deploying.md b/src/site/markdown/versions/master/building-and-deploying.md
index 56c2cc6..f5a2fb2 100644
--- a/src/site/markdown/versions/master/building-and-deploying.md
+++ b/src/site/markdown/versions/master/building-and-deploying.md
@@ -56,7 +56,7 @@ Installing an ElasticSearch server
 Starting with version 1.2, Apache Unomi no longer embeds an ElasticSearch server as this is no longer supported by 
 the developers of ElasticSearch. Therefore you will need to install a standalone ElasticSearch using the following steps:
 
-1. Download an ElasticSearch 5.x version (5.1.1 or more recent, but not 6.x). Here's the version you will need depending
+1. Download an ElasticSearch version. Here's the version you will need depending
 on your version of Apache Unomi.
 
     Apache Unomi <= 1.2 : [https://www.elastic.co/downloads/past-releases/elasticsearch-5-1-2](https://www.elastic.co/downloads/past-releases/elasticsearch-5-1-2)