aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-18 18:39:02 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-18 18:39:28 +0100
commit0a62831523bed497f0923856586137163df5fbdb (patch)
tree08acd77f56f3ef011d85812a6028871e735b8a86
parent0af8793bc4791c5d97b3a0be0e5a905d8123346f (diff)
downloadsonarqube-0a62831523bed497f0923856586137163df5fbdb.tar.gz
sonarqube-0a62831523bed497f0923856586137163df5fbdb.zip
Fix compatibility of ES 1.4 with KOPF
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java b/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java
index efca92943a5..ede9e33358c 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchSettings.java
@@ -137,7 +137,9 @@ class SearchSettings {
builder.put("http.enabled", false);
} else {
LOGGER.warn(String.format(
- "Elasticsearch HTTP connector is enabled on port %d. MUST NOT BE USED INTO PRODUCTION", httpPort));
+ "Elasticsearch HTTP connector is enabled on port %d. MUST NOT BE USED FOR PRODUCTION", httpPort));
+ // see https://github.com/lmenezes/elasticsearch-kopf/issues/195
+ builder.put("http.cors.enabled", true);
builder.put("http.enabled", true);
builder.put("http.host", "127.0.0.1");
builder.put("http.port", httpPort);