TASK: Update documentation for 2.x configuration

Author: kdambekalns

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/Version1/IndexerDriver.php

@@ -42,7 +42,7 @@ public function document($indexName, NodeInterface $node, ElasticSearchDocument
                         '_id' => $document->getId()
                     ]
                 ],
-                // http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-update.html
+                // http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.7/docs-update.html
                 [
                     'script' => '
                             fulltext = (ctx._source.containsKey("__fulltext") ? ctx._source.__fulltext : new LinkedHashMap());

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Driver/Version2/IndexerDriver.php

@@ -42,7 +42,7 @@ public function document($indexName, NodeInterface $node, ElasticSearchDocument
                         '_retry_on_conflict' => 3
                     ]
                 ],
-                // http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-update.html
+                // http://www.elasticsearch.org/guide/en/elasticsearch/reference/2.4/docs-update.html
                 [
                     'script' => [
                         'inline' => '

Documentation/ElasticConfiguration-1.6-1.7.md

@@ -1,6 +1,6 @@
 # Needed Configuration in configuration.yml for Elasticsearch 1.6.x and 1.7.x
 
-In verson 1.6 the `script.disable_dynamic` settings and the Groovy sandbox as such [have been deprecated]
+In version 1.6 the `script.disable_dynamic` settings and the Groovy sandbox as such [have been deprecated]
 (https://www.elastic.co/guide/en/elasticsearch/reference/1.6/modules-scripting.html#enable-dynamic-scripting).
 You may continue to use the settings for version 1.5.x, but this is what would be the correct configuration for 1.6.x and 1.7.x.
 

Documentation/ElasticConfiguration-2.x.md

@@ -0,0 +1,17 @@
+# Needed Configuration in configuration.yml for Elasticsearch 2.x
+
+Since version 2.0 the fine-grained script settings are in place as described in the scripting docs
+(https://www.elastic.co/guide/en/elasticsearch/reference/2.4/modules-scripting.html#enable-dynamic-scripting).
+
+```
+# The following settings are absolutely required for the CR adaptor to work
+script.inline: true
+
+# the following settings secure your cluster
+cluster.name: [PUT_YOUR_CUSTOM_NAME_HERE]
+network.host: 127.0.0.1
+
+# the following settings are well-suited for smaller Elasticsearch instances (e.g. as long as you can stay on one host)
+index.number_of_shards: 1
+index.number_of_replicas: 0
+```

README.md

@@ -8,13 +8,13 @@ main functionalities:
 * finding Nodes in TypoScript / Eel by arbitrary queries
 * Full-Text Indexing of Pages and other Documents (of course including the full content)
 
-## Elastic version support 
+## Elastic version support
 
-You can switch the Elastic driver by editing ```Settings.yaml``` 
+You can switch the Elastic driver by editing ```Settings.yaml```
 (```Flowpack.ElasticSearchContentRepositoryAdaptor.driver.version```) with the following value:
 
 * ```1.x``` to support Elastic 1.2 to 1.7
-* ```2.x``` to support Elastic 2.x to 1.4 
+* ```2.x``` to support Elastic 2.x
 
 _Currently the Driver interfaces as not marked as API, and can be changed to adapt to future needs (especially the support of Elastic v5)._
 
@@ -48,6 +48,7 @@ Finally, run `./flow nodeindex:build`, and add the search plugin to your page. I
 There is a need, depending on your version of Elasticsearch, to add specific configuration to your
 Elasticsearch Configuration File `<your-elasticsearch>/config/elasticsearch.yml`.
 
+- [ElasticSearch 2.x](Documentation/ElasticConfiguration-2.x.md)
 - [ElasticSearch 1.6 to 1.7](Documentation/ElasticConfiguration-1.6-1.7.md)
 - [ElasticSearch 1.4 to 1.5](Documentation/ElasticConfiguration-1.4-1.5.md)
 - [ElasticSearch 1.3](Documentation/ElasticConfiguration-1.3.md)
@@ -680,7 +681,7 @@ in the NodeTypes.yaml. Generally this works by defining the global mapping at `[
 
 ## Change the default Elastic index name
 
-If you need to run serveral (different) neos instances on the same elasticsearch server you will need to change the Configuration/Settings.yaml indexName for each of your project. 
+If you need to run serveral (different) neos instances on the same elasticsearch server you will need to change the Configuration/Settings.yaml indexName for each of your project.
 
 So `./flow nodeindex:build` or `./flow nodeindex:cleanup` won't overwrite your other sites index.