IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v2.0.0' into develop

Browse Source
This commit is contained in:
Alexey Safronov 2023-11-28 17:10:40 +04:00
commit a42049c594
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/appsettings.json
View File

@ -569,7 +569,8 @@
"dynamoDB": {
"accessKeyId": "",
"secretAccessKey": "",
"region": "us-east-1"
"region": "us-east-1",
"tableName": ""
}
}
}

4
config/nginx/onlyoffice.conf
View File

@ -114,7 +114,7 @@ server {
if redis_pass ~= "" then
local res, err = red:auth(redis_pass)
if not res then
ngx.log(ngx.INFO, "failed to authenticate: ", err)
ngx.log(ngx.ERR, "failed to authenticate: ", err)
return
end
end
@ -122,7 +122,7 @@ server {
local csp, err = red:hget(key, "data")
if csp == ngx.null or not csp then
ngx.log(ngx.ERR, "failed to get redis key: ", err)
ngx.log(ngx.INFO, "failed to get redis key: ", err)
else
ngx.header.Content_Security_Policy = csp
end

6
config/telegram.json
View File

@ -1,6 +0,0 @@
{
"telegramConf": {
"botKey": "",
"chatId": ""
}
}

8
install/common/build-services.sh
View File

@ -7,7 +7,7 @@ BUILD_PATH=${BUILD_PATH:-${SRC_PATH}/publish}
BUILD_DOTNET_CORE_ARGS=${BUILD_DOTNET_CORE_ARGS:-"false"}
PROPERTY_BUILD=${PROPERTY_BUILD:-"all"}
BACKEND_NODEJS_SERVICES=${BACKEND_NODEJS_SERVICES:-"ASC.Socket.IO, ASC.SsoAuth"} #, ASC.TelegramReports
BACKEND_NODEJS_SERVICES=${BACKEND_NODEJS_SERVICES:-"ASC.Socket.IO, ASC.SsoAuth"}
BACKEND_DOTNETCORE_SERVICES=${BACKEND_DOTNETCORE_SERVICES:-"ASC.Files, ASC.People, ASC.Data.Backup, ASC.Files.Service, ASC.Notify, \
ASC.Studio.Notify, ASC.Web.Api, ASC.Web.Studio, ASC.Data.Backup.BackgroundTasks, ASC.ClearEvents, ASC.ApiSystem, ASC.Web.HealthChecks.UI"}
SELF_CONTAINED=${SELF_CONTAINED:-"false"}
@ -180,12 +180,6 @@ function backend-nodejs-publish {
mkdir -p ${BUILD_PATH}/services/${ARRAY_NAME_SERVICES[$i]}/service/ && \
cp -rfv ${SRC_PATH}/server/common/${ARRAY_NAME_SERVICES[$i]}/* ${BUILD_PATH}/services/${ARRAY_NAME_SERVICES[$i]}/service/
if [[ ${ARRAY_NAME_SERVICES[$i]} == "ASC.TelegramReports" ]]
then
# build before run
yarn --cwd ${BUILD_PATH}/services/ASC.TelegramReports/service/ build
fi
if [[ ${DOCKER_ENTRYPOINT} != "false" ]]
then
echo "== ADD ${DOCKER_ENTRYPOINT} to ${ARRAY_NAME_SERVICES[$i]} =="