mirrors/overleaf-toolkit
1
0
Fork 0
mirror of https://github.com/overleaf/toolkit.git synced 2025-04-19 07:18:06 +02:00
Code Activity

Merge remote-tracking branch 'origin/master' into jpa-loud-warning

Browse source
This commit is contained in:
Jakob Ackermann 2024-09-11 09:37:41 +01:00
commit f2bbfc9a3e
No known key found for this signature in database
GPG key ID: 30C56800FCA3828A
7 changed files with 54 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bin/docker-compose
View file

@ -41,6 +41,9 @@ function build_environment() {
fi
fi
fi
if [[ "${OVERLEAF_LOG_PATH:-null}" != "null" ]]; then
set_logging_vars
fi
if [[ $NGINX_ENABLED == "true" ]]; then
set_nginx_vars
fi
@ -56,6 +59,9 @@ function build_environment() {
function canonicalize_data_paths() {
OVERLEAF_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$OVERLEAF_DATA_PATH")
if [[ "${OVERLEAF_LOG_PATH:-null}" != "null" ]]; then
OVERLEAF_LOG_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$OVERLEAF_LOG_PATH")
fi
MONGO_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$MONGO_DATA_PATH")
REDIS_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$REDIS_DATA_PATH")
GIT_BRIDGE_DATA_PATH=$(cd "$TOOLKIT_ROOT"; realpath "$GIT_BRIDGE_DATA_PATH")
@ -159,6 +165,19 @@ function set_sibling_containers_vars() {
export OVERLEAF_DATA_PATH
}
# Set environment variables for docker-compose.logging.yml
function set_logging_vars() {
DOCKER_COMPOSE_FLAGS+=(-f "$TOOLKIT_ROOT/lib/docker-compose.logging.yml")
if [[ $IMAGE_VERSION_MAJOR -ge 5 ]]; then
OVERLEAF_IN_CONTAINER_LOG_PATH="/var/log/overleaf"
else
OVERLEAF_IN_CONTAINER_LOG_PATH="/var/log/sharelatex"
fi
export OVERLEAF_IN_CONTAINER_LOG_PATH
export OVERLEAF_LOG_PATH
}
# Set environment variables for docker-compose.nginx.yml
function set_nginx_vars() {
DOCKER_COMPOSE_FLAGS+=(-f "$TOOLKIT_ROOT/lib/docker-compose.nginx.yml")

5
bin/doctor
View file

@ -210,6 +210,11 @@ function check_config_files() {
print_point 2 "OVERLEAF_DATA_PATH: MISSING !"
add_warning "rc file, OVERLEAF_DATA_PATH not set"
fi
if [[ "${OVERLEAF_LOG_PATH:-null}" != "null" ]]; then
print_point 2 "OVERLEAF_LOG_PATH: $OVERLEAF_LOG_PATH"
else
print_point 2 "OVERLEAF_LOG_PATH: not set, keeping logs in container"
fi
print_point 2 "SERVER_PRO: $SERVER_PRO"
print_point 2 "SIBLING_CONTAINERS_ENABLED: $SIBLING_CONTAINERS_ENABLED"