Merge branch 'develop' into feature/tree-menu-bugfix

build/install/docker/.env

@@ -4,7 +4,7 @@
     STATUS=""
     SRV_VERSION=latest
     MYSQL_VERSION=8.0.18
-    ELK_VERSION=7.8.1
+    ELK_VERSION=7.13.1
     SERVICE_PORT=5050
     CONTAINER_PREFIX=${PRODUCT}-
     DOCKERFILE=Dockerfile-app

build/install/docker/docker-entrypoint.sh

@@ -34,9 +34,8 @@ VIEWED_MEDIA=${VIEWED_MEDIA:-'".aac",".flac",".m4a",".mp3",".oga",".ogg",".wav",
 FFMPEG_EXTS=${FFMPEG_EXTS:-'"avi", "mpeg", "mpg", "wmv"'}
 
 ELK_SHEME=${ELK_SHEME:-"http"}
-ELK_HOST=${ELK_HOST:-"elasticsearch"}
+ELK_HOST=${ELK_HOST:-"${PRODUCT}-elasticsearch"}
 ELK_PORT=${ELK_PORT:-"9200"}
-ELK_VALUE='"elastic": { "Scheme": "'${ELK_SHEME}'", "Host": "'${ELK_HOST}'", "Port": "'${ELK_PORT}'" },'
 
 KAFKA_HOST=${KAFKA_HOST:-"kafka"}":9092"
 
@@ -68,7 +67,9 @@ sed -i "s!\"exts\".*!\"exts\": \[ ${FFMPEG_EXTS} \]!g" ${PATH_TO_CONF}/appsettin
 sed -i "0,/\"value\"/s!\"value\".*,!\"value\": \"${DOCUMENT_SERVER_JWT_SECRET}\",!" ${PATH_TO_CONF}/appsettings.${APP_DOTNET_ENV}.json
 sed -i "s!\"header\".*!\"header\": \"${DOCUMENT_SERVER_JWT_HEADER}\"!" ${PATH_TO_CONF}/appsettings.${APP_DOTNET_ENV}.json
 
-grep -q "${ELK_VALUE}" ${PATH_TO_CONF}/appsettings.${APP_DOTNET_ENV}.json || sed -i "s!\"files\".*!${ELK_VALUE}\n\"files\": {!" ${PATH_TO_CONF}/appsettings.${APP_DOTNET_ENV}.json
+sed -i "s!\"Scheme\".*!\"Scheme\": \"${ELK_SHEME}\"!g" ${PATH_TO_CONF}/elastic.json
+sed -i "s!\"Host\".*!\"Host\": \"${ELK_HOST}\"!g" ${PATH_TO_CONF}/elastic.json
+sed -i "s!\"Port\".*!\"Port\": \"${ELK_PORT}\"!g" ${PATH_TO_CONF}/elastic.json
 
 sed -i "s!\"subfolder\".*!\"subfolder\": \"server\",!g" ${PATH_TO_CONF}/appsettings.services.json
 sed -i "s!\"BootstrapServers\".*!\"BootstrapServers\": \"${KAFKA_HOST}\"!g" ${PATH_TO_CONF}/kafka.${APP_DOTNET_ENV}.json

config/elastic.json

@@ -0,0 +1,9 @@
+{
+	"elastic": {
+		"elastic": { 
+            "Scheme": "http",
+            "Host": "onlyoffice-elasticsearch",
+            "Port": "9200"
+        }
+	}
+}