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

Merge branch 'release/v2.5.0' into feature/logo-handler

Browse Source
This commit is contained in:
Alexey Safronov 2024-04-02 15:47:36 +04:00
commit 1ba6492a8c
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/appsettings.json
View File

@ -251,6 +251,7 @@
"firebase": { "firebase": {
"script": ["*.googleapis.com", "*.firebaseio.com"], "script": ["*.googleapis.com", "*.firebaseio.com"],
"frame": ["personal-teamlab-guru.firebaseapp.com"], "frame": ["personal-teamlab-guru.firebaseapp.com"],
"img": ["personal-teamlab-guru.firebaseapp.com"],
"connect": ["personal-teamlab-guru.firebaseapp.com", "*.googleapis.com"] "connect": ["personal-teamlab-guru.firebaseapp.com", "*.googleapis.com"]
}, },
"oform": { "oform": {

14
install/common/product-configuration
View File

@ -778,6 +778,16 @@ check_connection_external_services() {
return $HOST_RESPONCE return $HOST_RESPONCE
} }
# Function to prevent package auto-update
hold_package_version(){
if command -v apt >/dev/null 2>&1 &&
dpkg -s $1 >/dev/null 2>&1 &&
! apt-mark showhold | grep -q $1 >/dev/null 2>&1
then
apt-mark hold $1 >/dev/null 2>&1
fi
}
if command -v yum >/dev/null 2>&1; then if command -v yum >/dev/null 2>&1; then
DIST="RedHat" DIST="RedHat"
PACKAGE_MANAGER="rpm -q" PACKAGE_MANAGER="rpm -q"
@ -790,6 +800,7 @@ elif command -v apt >/dev/null 2>&1; then
MYSQL_PACKAGE="mysql" MYSQL_PACKAGE="mysql"
REDIS_PACKAGE="redis-server" REDIS_PACKAGE="redis-server"
SYSTEMD_DIR="$(dirname $(dpkg-query -L ${PRODUCT}-api | grep systemd/system/))" SYSTEMD_DIR="$(dirname $(dpkg-query -L ${PRODUCT}-api | grep systemd/system/))"
hold_package_version dotnet-host
fi fi
install_json install_json
@ -818,6 +829,7 @@ if [[ ! -z $EXTERNAL_ELK_FLAG ]]; then
setup_elasticsearch "EXTERNAL_ELASTIC_SERVER" setup_elasticsearch "EXTERNAL_ELASTIC_SERVER"
elif $PACKAGE_MANAGER opensearch >/dev/null 2>&1; then elif $PACKAGE_MANAGER opensearch >/dev/null 2>&1; then
setup_elasticsearch "LOCAL_ELASTIC_SERVER" setup_elasticsearch "LOCAL_ELASTIC_SERVER"
hold_package_version opensearch
fi fi
if [[ ! -z $EXTERNAL_REDIS_FLAG ]]; then if [[ ! -z $EXTERNAL_REDIS_FLAG ]]; then
@ -825,6 +837,7 @@ if [[ ! -z $EXTERNAL_REDIS_FLAG ]]; then
setup_redis "EXTERNAL_REDIS_SERVER" setup_redis "EXTERNAL_REDIS_SERVER"
elif $PACKAGE_MANAGER $REDIS_PACKAGE >/dev/null 2>&1; then elif $PACKAGE_MANAGER $REDIS_PACKAGE >/dev/null 2>&1; then
setup_redis "LOCAL_REDIS_SERVER" setup_redis "LOCAL_REDIS_SERVER"
hold_package_version $REDIS_PACKAGE
fi fi
if [[ ! -z $EXTERNAL_RABBITMQ_FLAG ]]; then if [[ ! -z $EXTERNAL_RABBITMQ_FLAG ]]; then
@ -832,6 +845,7 @@ if [[ ! -z $EXTERNAL_RABBITMQ_FLAG ]]; then
setup_rabbitmq "EXTERNAL_RABBITMQ_SERVER" setup_rabbitmq "EXTERNAL_RABBITMQ_SERVER"
elif $PACKAGE_MANAGER rabbitmq-server >/dev/null 2>&1; then elif $PACKAGE_MANAGER rabbitmq-server >/dev/null 2>&1; then
setup_rabbitmq "LOCAL_RABBITMQ_SERVER" setup_rabbitmq "LOCAL_RABBITMQ_SERVER"
hold_package_version rabbitmq-server
fi fi
restart_services restart_services