Merge pull request #1734 from HansBambel/use-https-per-default

Use https protocol in local nodes per default

docs/source/admin/fs/elasticsearch.rst

@@ -220,8 +220,10 @@ Node settings
 ^^^^^^^^^^^^^
 
 FSCrawler is using elasticsearch REST layer to send data to your
-running cluster. By default, it connects to ``http://127.0.0.1:9200``
-which is the default when running a local node on your machine.
+running cluster. By default, it connects to ``https://127.0.0.1:9200``
+which is the default when running a local node on your machine. 
+Note that using ``https`` requires SSL Configuration set up.
+For more information, read  :ref:`ssl`.
 
 Of course, in production, you would probably change this and connect to
 a production cluster:
@@ -231,7 +233,7 @@ a production cluster:
    name: "test"
    elasticsearch:
      nodes:
-     - url: "http://mynode1.mycompany.com:9200"
+     - url: "https://mynode1.mycompany.com:9200"
 
 If you are using `Elasticsearch service by Elastic <https://www.elastic.co/cloud/elasticsearch-service>`_,
 you can just use the ``Cloud ID`` which is available in the Cloud Console and paste it:
@@ -257,12 +259,12 @@ You can define multiple nodes:
    name: "test"
    elasticsearch:
      nodes:
-     - url: "http://mynode1.mycompany.com:9200"
-     - url: "http://mynode2.mycompany.com:9200"
-     - url: "http://mynode3.mycompany.com:9200"
+     - url: "https://mynode1.mycompany.com:9200"
+     - url: "https://mynode2.mycompany.com:9200"
+     - url: "https://mynode3.mycompany.com:9200"
 
 .. note::
-    .. versionadded:: 2.2 you can use HTTPS instead of default HTTP.
+    .. versionadded:: 2.2 you can use HTTPS instead of HTTP.
 
     .. code:: yaml
 

settings/src/main/java/fr/pilato/elasticsearch/crawler/fs/settings/Elasticsearch.java

@@ -34,7 +34,7 @@
 public class Elasticsearch {
 
     protected static final Logger logger = LogManager.getLogger(Elasticsearch.class);
-    public static final ServerUrl NODE_DEFAULT = new ServerUrl("http://127.0.0.1:9200");
+    public static final ServerUrl NODE_DEFAULT = new ServerUrl("https://127.0.0.1:9200");
 
     private List<ServerUrl> nodes = Collections.singletonList(NODE_DEFAULT);
     private String index;

settings/src/test/java/fr/pilato/elasticsearch/crawler/fs/settings/FsSettingsParserTest.java

@@ -129,9 +129,9 @@ private void defaultSettingsTester(FsSettings settings) {
         assertThat(settings.getElasticsearch().getIndex(), is("test"));
         assertThat(settings.getElasticsearch().getIndexFolder(), is("test_folder"));
         assertThat(settings.getElasticsearch().getNodes(), iterableWithSize(1));
-        assertThat(settings.getElasticsearch().getNodes().get(0).getUrl(), is("http://127.0.0.1:9200"));
+        assertThat(settings.getElasticsearch().getNodes().get(0).getUrl(), is("https://127.0.0.1:9200"));
         assertThat(settings.getElasticsearch().getNodes().get(0).getCloudId(), is(nullValue()));
-        assertThat(settings.getElasticsearch().getNodes().get(0).decodedUrl(), is("http://127.0.0.1:9200"));
+        assertThat(settings.getElasticsearch().getNodes().get(0).decodedUrl(), is("https://127.0.0.1:9200"));
 
         assertThat(settings.getElasticsearch().getUsername(), is(nullValue()));
         assertThat(settings.getElasticsearch().getPassword(), is(nullValue()));