From 8ad3638b4274724495df70a8b4e93a4cf5e92944 Mon Sep 17 00:00:00 2001 From: Nicolas CARPi Date: Mon, 9 Sep 2024 20:59:35 +0200 Subject: [PATCH] add MAX_UPLOAD_SIZE and MAX_UPLOAD_TIME into php env so it can get to api/v2/import and then to JS see elabftw/elabftw#5232 --- src/entrypoint/docker-entrypoint.sh | 5 +++++ src/php/elabpool.conf | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/entrypoint/docker-entrypoint.sh b/src/entrypoint/docker-entrypoint.sh index 44f5ce6..7d91305 100755 --- a/src/entrypoint/docker-entrypoint.sh +++ b/src/entrypoint/docker-entrypoint.sh @@ -35,6 +35,7 @@ getEnv() { unset SECRET_KEY max_php_memory=${MAX_PHP_MEMORY:-2G} max_upload_size=${MAX_UPLOAD_SIZE:-100M} + max_upload_time=${MAX_UPLOAD_TIME:-900000} # CIS benchmark nginx 2.0.0 2.4.3 keepalive_timeout=${KEEPALIVE_TIMEOUT:-10s} php_timezone=${PHP_TIMEZONE:-Europe/Paris} @@ -354,6 +355,8 @@ populatePhpEnv() { sed -i -e "/%DB_CERT_PATH%/d" /etc/php83/php-fpm.d/elabpool.conf fi sed -i -e "s/%SECRET_KEY%/${secret_key}/" /etc/php83/php-fpm.d/elabpool.conf + sed -i -e "s/%MAX_UPLOAD_SIZE%/${max_upload_size}/" /etc/php83/php-fpm.d/elabpool.conf + sed -i -e "s/%MAX_UPLOAD_TIME%/${max_upload_time}/" /etc/php83/php-fpm.d/elabpool.conf # use # as separator instead of slash sed -i -e "s#%SITE_URL%#${site_url}#" /etc/php83/php-fpm.d/elabpool.conf # assume that if ak is set, then sk is too @@ -376,6 +379,8 @@ populateBashEnv() { export DB_USER='${db_user}' export DB_PASSWORD='${db_password}' export DB_CERT_PATH='${db_cert_path}' + export MAX_UPLOAD_SIZE='${max_upload_size}' + export MAX_UPLOAD_TIME='${max_upload_time}' export SECRET_KEY='${secret_key}' export SITE_URL='${site_url}' export ELAB_AWS_ACCESS_KEY='${aws_ak}' diff --git a/src/php/elabpool.conf b/src/php/elabpool.conf index 0c64473..b7d7b79 100644 --- a/src/php/elabpool.conf +++ b/src/php/elabpool.conf @@ -113,6 +113,8 @@ env[DB_NAME] = "%DB_NAME%" env[DB_USER] = "%DB_USER%" env[DB_PASSWORD] = "%DB_PASSWORD%" env[DB_CERT_PATH] = "%DB_CERT_PATH%" +env[MAX_UPLOAD_SIZE] = "%MAX_UPLOAD_SIZE%" +env[MAX_UPLOAD_TIME] = "%MAX_UPLOAD_TIME%" env[SECRET_KEY] = "%SECRET_KEY%" env[SITE_URL] = "%SITE_URL%" env[ELAB_AWS_ACCESS_KEY] = "%ELAB_AWS_ACCESS_KEY%"