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

Merge branch 'hotfix/v1.1.2' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.1.2

Browse Source
This commit is contained in:
Tatiana Lopaeva 2023-08-29 17:45:57 +03:00
commit 2ba1479640
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build/install/OneClickInstall/install-Docker.sh
View File

@ -867,6 +867,26 @@ read_continue_installation () {
}
domain_check () {
if ! command_exists dig; then
install_service dig dnsutils
fi
if ! command_exists ping; then
if command_exists apt-get; then
install_service ping iputils-ping
elif command_exists yum; then
install_service ping iputils
fi
fi
if ! command_exists ip; then
if command_exists apt-get; then
install_service ip iproute2
elif command_exists yum; then
install_service ip iproute
fi
fi
DOMAINS=$(dig +short -x $(curl -s ifconfig.me) | sed 's/\.$//')
if [[ -n "$DOMAINS" ]]; then
@ -1262,6 +1282,8 @@ install_elasticsearch () {
install_product () {
DOCKER_TAG="${DOCKER_TAG:-$(get_available_version ${IMAGE_NAME})}"
reconfigure DOCKER_TAG ${DOCKER_TAG}
[ "${UPDATE}" = "true" ] && LOCAL_CONTAINER_TAG="$(docker inspect --format='{{index .Config.Image}}' ${CONTAINER_NAME} | awk -F':' '{print $2}')"
if [ "${UPDATE}" = "true" ] && [ "${LOCAL_CONTAINER_TAG}" != "${DOCKER_TAG}" ]; then
@ -1274,7 +1296,6 @@ install_product () {
reconfigure APP_CORE_MACHINEKEY ${APP_CORE_MACHINEKEY}
reconfigure APP_CORE_BASE_DOMAIN ${APP_CORE_BASE_DOMAIN}
reconfigure APP_URL_PORTAL "${APP_URL_PORTAL:-"http://${PACKAGE_SYSNAME}-proxy:8092"}"
reconfigure DOCKER_TAG ${DOCKER_TAG}
[[ -n $EXTERNAL_PORT ]] && sed -i "s/8092:8092/${EXTERNAL_PORT}:8092/g" $BASE_DIR/${PRODUCT}.yml

6
build/install/docker/config/nginx/templates/upstream.conf.template
View File

@ -71,3 +71,9 @@ map "$DOCUMENT_SERVER_URL_EXTERNAL" "$document_server" {
default "$DOCUMENT_SERVER_URL_EXTERNAL";
"" "http://$DOCUMENT_CONTAINER_NAME";
}
map $SERVICE_CLIENT $service_client {
volatile;
"" 127.0.0.1:5001;
default $SERVICE_CLIENT;
}

4
packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js
View File

@ -164,7 +164,9 @@ class ThirdPartyServices extends React.Component {
(consumer) =>
consumer.title !== "Bitly" &&
consumer.title !== "WordPress" &&
consumer.title !== "DocuSign"
consumer.title !== "DocuSign" &&
consumer.name !== "clickatell" && //TODO: hide while 2fa by sms is not working
consumer.name !== "twilio"
);
const imgSrc = theme.isBase ? IntegrationSvgUrl : IntegrationDarkSvgUrl;