Correct a typo in the name of the scheme variable

install/OneClickInstall/install-Docker.sh

@@ -77,7 +77,7 @@ MYSQL_PORT=""
 DATABASE_MIGRATION="true"
 
 ELK_VERSION=""
-ELK_SHEME=""
+ELK_SCHEME=""
 ELK_HOST=""
 ELK_PORT=""
 
@@ -226,7 +226,7 @@ while [ "$1" != "" ]; do
 
 		-espr | --elasticprotocol )
 			if [ "$2" != "" ]; then
-				ELK_SHEME=$2
+				ELK_SCHEME=$2
 				shift
 			fi
 		;;
@@ -1109,7 +1109,7 @@ set_docspace_params() {
 	APP_CORE_BASE_DOMAIN=${APP_CORE_BASE_DOMAIN:-$(get_env_parameter "APP_CORE_BASE_DOMAIN" "${CONTAINER_NAME}")};
 	EXTERNAL_PORT=${EXTERNAL_PORT:-$(get_env_parameter "EXTERNAL_PORT" "${CONTAINER_NAME}")};
 
-	ELK_SHEME=${ELK_SHEME:-$(get_env_parameter "ELK_SHEME" "${CONTAINER_NAME}")};
+	ELK_SCHEME=${ELK_SCHEME:-$(get_env_parameter "ELK_SCHEME" "${CONTAINER_NAME}")};
 	ELK_HOST=${ELK_HOST:-$(get_env_parameter "ELK_HOST" "${CONTAINER_NAME}")};
 	ELK_PORT=${ELK_PORT:-$(get_env_parameter "ELK_PORT" "${CONTAINER_NAME}")};
 
@@ -1256,7 +1256,7 @@ install_elasticsearch () {
 		docker-compose -f $BASE_DIR/elasticsearch.yml up -d
 	elif [ ! -z "$ELK_HOST" ]; then
 		establish_conn ${ELK_HOST} "${ELK_PORT:-"9200"}" "Elasticsearch"
-		reconfigure ELK_SHEME "${ELK_SHEME:-"http"}"	
+		reconfigure ELK_SCHEME "${ELK_SCHEME:-"http"}"	
 		reconfigure ELK_HOST ${ELK_HOST}
 		reconfigure ELK_PORT "${ELK_PORT:-"9200"}"	
 	fi

install/common/product-configuration

@@ -23,7 +23,7 @@ DB_PWD=""
 APP_HOST="localhost"
 APP_PORT="80"
 
-ELK_SHEME="http"
+ELK_SCHEME="http"
 ELK_HOST="localhost"
 ELK_PORT="9200"
 
@@ -57,9 +57,9 @@ while [ "$1" != "" ]; do
 			fi
 		;;
 
-		-ess | --elasticsheme )
+		-ess | --elasticscheme )
 			if [ "$2" != "" ]; then
-				ELK_SHEME=$2
+				ELK_SCHEME=$2
 				shift
 			fi
 		;;
@@ -678,7 +678,7 @@ setup_elasticsearch() {
 
 	#Save elasticsearch parameters in .json
 	[[ $1 == "EXTERNAL_ELASTIC_SERVER" ]] && local EXTERNAL_ELASTIC_FLAG="rewrite"
-	save_undefined_param "${APP_DIR}/elastic.${ENVIRONMENT}.json" "elastic.Scheme" "${ELK_SHEME}" "$EXTERNAL_ELASTIC_FLAG"
+	save_undefined_param "${APP_DIR}/elastic.${ENVIRONMENT}.json" "elastic.Scheme" "${ELK_SCHEME}" "$EXTERNAL_ELASTIC_FLAG"
 	save_undefined_param "${APP_DIR}/elastic.${ENVIRONMENT}.json" "elastic.Host" "${ELK_HOST}" "$EXTERNAL_ELASTIC_FLAG"
 	save_undefined_param "${APP_DIR}/elastic.${ENVIRONMENT}.json" "elastic.Port" "${ELK_PORT}" "$EXTERNAL_ELASTIC_FLAG"
 	save_undefined_param "${APP_DIR}/elastic.${ENVIRONMENT}.json" "elastic.Threads" "1" "$EXTERNAL_ELASTIC_FLAG"

install/deb/debian/config

@@ -8,7 +8,7 @@ db_input low {{product}}/environment || true
 db_input low {{product}}/host || true
 db_input low {{product}}/port || true
 
-db_input low {{product}}/elasticsearch-sheme || true
+db_input low {{product}}/elasticsearch-scheme || true
 db_input low {{product}}/elasticsearch-host || true
 db_input low {{product}}/elasticsearch-port || true
 

install/deb/debian/postinst

@@ -63,14 +63,14 @@ case "$1" in
 
 		[ -n "$RABBITMQ_HOST" ] && args+=(-rbh "$RABBITMQ_HOST" -rbp "$RABBITMQ_PORT" -rbu "$RABBITMQ_USER" -rbpw "$RABBITMQ_PASSWORD" );
 		
-		db_get {{product}}/elasticsearch-sheme || true
+		db_get {{product}}/elasticsearch-scheme || true
-		ELK_SHEME="$RET"
+		ELK_SCHEME="$RET"
 		db_get {{product}}/elasticsearch-host || true
 		ELK_HOST="$RET"
 		db_get {{product}}/elasticsearch-port || true
 		ELK_PORT="$RET"
 
-		[ -n "$ELK_HOST" ] && args+=(-ess "$ELK_SHEME" -esh "$ELK_HOST" -esp "$ELK_PORT" );
+		[ -n "$ELK_HOST" ] && args+=(-ess "$ELK_SCHEME" -esh "$ELK_HOST" -esp "$ELK_PORT" );
 
 		db_get {{product}}/ds-url || true
 		DOCUMENT_SERVER_URL_EXTERNAL="$RET"

install/deb/debian/product.templates

@@ -36,7 +36,7 @@ Template: {{product}}/ds-url
 Type: string
 Description: ONLYOFFICE Docs URL:
 
-Template: {{product}}/elasticsearch-sheme
+Template: {{product}}/elasticsearch-scheme
 Type: select
 Choices: http, https
 Default: http

install/docker/.env

@@ -32,7 +32,7 @@
 
 # elasticsearch #
     ELK_CONTAINER_NAME=${CONTAINER_PREFIX}elasticsearch
-    ELK_SHEME=http
+    ELK_SCHEME=http
     ELK_HOST=""
     ELK_PORT=9200
 

install/docker/docker-entrypoint.py

@@ -48,7 +48,7 @@ DOCUMENT_SERVER_URL_PUBLIC = DOCUMENT_SERVER_URL_EXTERNAL if DOCUMENT_SERVER_URL
 DOCUMENT_SERVER_CONNECTION_HOST = DOCUMENT_SERVER_URL_EXTERNAL if DOCUMENT_SERVER_URL_EXTERNAL else DOCUMENT_SERVER_URL_INTERNAL
 
 ELK_CONTAINER_NAME = os.environ["ELK_CONTAINER_NAME"] if environ.get("ELK_CONTAINER_NAME") else "onlyoffice-elasticsearch"
-ELK_SHEME = os.environ["ELK_SHEME"] if environ.get("ELK_SHEME") else "http"
+ELK_SCHEME = os.environ["ELK_SCHEME"] if environ.get("ELK_SCHEME") else "http"
 ELK_HOST = os.environ["ELK_HOST"] if environ.get("ELK_HOST") else None
 ELK_PORT = os.environ["ELK_PORT"] if environ.get("ELK_PORT") else "9200"
 ELK_THREADS = os.environ["ELK_THREADS"] if environ.get("ELK_THREADS") else "1"
@@ -215,7 +215,7 @@ if OAUTH_REDIRECT_URL:
 
 filePath = "/app/onlyoffice/config/elastic.json"
 jsonData = openJsonFile(filePath)
-jsonData["elastic"]["Scheme"] = ELK_SHEME
+jsonData["elastic"]["Scheme"] = ELK_SCHEME
 jsonData["elastic"]["Host"] = ELK_CONNECTION_HOST
 jsonData["elastic"]["Port"] = ELK_PORT
 jsonData["elastic"]["Threads"] = ELK_THREADS

install/docker/docker-entrypoint.sh

@@ -28,9 +28,9 @@ PRODUCT=${PRODUCT:-"onlyoffice"}
 ENV_EXTENSION=${ENV_EXTENSION:-"test"}
 ROUTER_HOST=${ROUTER_HOST:-"onlyoffice-router"}
 
-SHEME=${SHEME:-"http"}
+SCHEME=${SCHEME:-"http"}
 SERVICE_PORT=${SERVICE_PORT:-"5050"}
-URLS=${URLS:-"${SHEME}://0.0.0.0:${SERVICE_PORT}"}
+URLS=${URLS:-"${SCHEME}://0.0.0.0:${SERVICE_PORT}"}
 
 PATH_TO_CONF=${PATH_TO_CONF:-"/app/${PRODUCT}/config"}
 LOG_DIR=${LOG_DIR:-"/var/log/${PRODUCT}"}
@@ -41,15 +41,15 @@ MYSQL_USER=${MYSQL_USER:-"${PRODUCT}_user"}
 MYSQL_PASSWORD=${MYSQL_PASSWORD:-"${PRODUCT}_pass"}
 
 APP_CORE_BASE_DOMAIN=${APP_CORE_BASE_DOMAIN:-"localhost"}
-APP_URL_PORTAL=${APP_URL_PORTAL:-"${SHEME}://${ROUTER_HOST}:8092"}
+APP_URL_PORTAL=${APP_URL_PORTAL:-"${SCHEME}://${ROUTER_HOST}:8092"}
 
 APP_CORE_MACHINEKEY=${APP_CORE_MACHINEKEY:-"your_core_machinekey"}
 DOCUMENT_SERVER_JWT_SECRET=${DOCUMENT_SERVER_JWT_SECRET:-"your_jwt_secret"}
 DOCUMENT_SERVER_JWT_HEADER=${DOCUMENT_SERVER_JWT_HEADER:-"AuthorizationJwt"}
 DOCUMENT_SERVER_URL_PUBLIC=${DOCUMENT_SERVER_URL_PUBLIC:-"/ds-vpath/"}
-DOCUMENT_SERVER_URL_INTERNAL=${DOCUMENT_SERVER_URL_INTERNAL:-"${SHEME}://${PRODUCT}-document-server/"}
+DOCUMENT_SERVER_URL_INTERNAL=${DOCUMENT_SERVER_URL_INTERNAL:-"${SCHEME}://${PRODUCT}-document-server/"}
 
-ELK_SHEME=${ELK_SHEME:-"http"}
+ELK_SCHEME=${ELK_SCHEME:-"http"}
 ELK_HOST=${ELK_HOST:-"${PRODUCT}-elasticsearch"}
 ELK_PORT=${ELK_PORT:-"9200"}
 ELK_THREADS=${ELK_THREADS:-"1"}
@@ -100,7 +100,7 @@ sed -i "0,/\"value\"/s!\"value\".*,!\"value\": \"${DOCUMENT_SERVER_JWT_SECRET}\"
 sed -i "s!\"header\".*!\"header\": \"${DOCUMENT_SERVER_JWT_HEADER}\"!" ${PATH_TO_CONF}/appsettings.${ENV_EXTENSION}.json
 sed -i "s!\"core\".*{!\"migration\": {\n\"enabled\": \"${DATABASE_MIGRATION}\"\n},\n\"core\": {!g" ${PATH_TO_CONF}/appsettings.${ENV_EXTENSION}.json
 
-sed -i "s!\"Scheme\".*!\"Scheme\": \"${ELK_SHEME}\",!g" ${PATH_TO_CONF}/elastic.json
+sed -i "s!\"Scheme\".*!\"Scheme\": \"${ELK_SCHEME}\",!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!\"Threads\".*!\"Threads\": \"${ELK_THREADS}\"!g" ${PATH_TO_CONF}/elastic.json

install/docker/docker-healthchecks-entrypoint.sh

@@ -15,8 +15,8 @@ echo "Executing -- ${NAME_SERVICE}"
 PRODUCT=${PRODUCT:-"onlyoffice"}
 CONTAINER_PREFIX=${PRODUCT}-
 SERVICE_PORT=${SERVICE_PORT:-"5050"}
-SHEME=${SHEME:-"http"}
+SCHEME=${SCHEME:-"http"}
-URLS=${URLS:-"${SHEME}://0.0.0.0:${SERVICE_PORT}"}
+URLS=${URLS:-"${SCHEME}://0.0.0.0:${SERVICE_PORT}"}
 PATH_TO_CONF=${PATH_TO_CONF:-"/var/www/services/ASC.Web.HealthChecks.UI/service"}
 
 API_SYSTEM_HOST=${API_SYSTEM_HOST:-"${CONTAINER_PREFIX}api-system:${SERVICE_PORT}"}

install/docker/docspace.profiles.yml

@@ -42,7 +42,7 @@ x-service: &x-service-base
     DOCUMENT_SERVER_URL_EXTERNAL: ${DOCUMENT_SERVER_URL_EXTERNAL}
     KAFKA_HOST: ${KAFKA_HOST}
     ELK_CONTAINER_NAME: ${ELK_CONTAINER_NAME}
-    ELK_SHEME: ${ELK_SHEME}
+    ELK_SCHEME: ${ELK_SCHEME}
     ELK_HOST: ${ELK_HOST}
     ELK_PORT: ${ELK_PORT}
     REDIS_CONTAINER_NAME: ${REDIS_CONTAINER_NAME}

install/docker/docspace.yml

@@ -35,7 +35,7 @@ x-service: &x-service-base
     DOCUMENT_SERVER_URL_EXTERNAL: ${DOCUMENT_SERVER_URL_EXTERNAL}
     KAFKA_HOST: ${KAFKA_HOST}
     ELK_CONTAINER_NAME: ${ELK_CONTAINER_NAME}
-    ELK_SHEME: ${ELK_SHEME}
+    ELK_SCHEME: ${ELK_SCHEME}
     ELK_HOST: ${ELK_HOST}
     ELK_PORT: ${ELK_PORT}
     REDIS_CONTAINER_NAME: ${REDIS_CONTAINER_NAME}

install/docker/notify.yml

@@ -36,7 +36,7 @@ x-service:
       DOCUMENT_SERVER_URL_EXTERNAL: ${DOCUMENT_SERVER_URL_EXTERNAL}
       KAFKA_HOST: ${KAFKA_HOST}
       ELK_CONTAINER_NAME: ${ELK_CONTAINER_NAME}
-      ELK_SHEME: ${ELK_SHEME}
+      ELK_SCHEME: ${ELK_SCHEME}
       ELK_HOST: ${ELK_HOST}
       ELK_PORT: ${ELK_PORT}
       REDIS_CONTAINER_NAME: ${REDIS_CONTAINER_NAME}