diff --git a/.env.sample b/.env.sample index 3298645..6e17c97 100644 --- a/.env.sample +++ b/.env.sample @@ -42,6 +42,10 @@ SECRET_DB_PASSWORD_VERSION=v1 # Multisite (see README) #MULTISITE=enable # either 'enable', 'subdomain' or 'subfolder' +# File upload settings +#UPLOAD_MAX_SIZE=256M +#UPLOAD_MAX_TIME=30 + # Local SMTP relay #COMPOSE_FILE="$COMPOSE_FILE:compose.mailrelay.yml" #SMTP_HOST="postfix_relay_app" diff --git a/abra.sh b/abra.sh index 42a207d..e0b4f3d 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export PHP_UPLOADS_CONF_VERSION=v3 +export PHP_UPLOADS_CONF_VERSION=v4 export ENTRYPOINT_CONF_VERSION=v7 export ENTRYPOINT_MAILRELAY_CONF_VERSION=v2 export MSMTP_CONF_VERSION=v4 diff --git a/compose.yml b/compose.yml index 135c669..197a6cf 100644 --- a/compose.yml +++ b/compose.yml @@ -109,7 +109,7 @@ configs: template_driver: golang php_uploads_conf: name: ${STACK_NAME}_php_uploads_conf_${PHP_UPLOADS_CONF_VERSION} - file: uploads.ini + file: uploads.ini.tmpl htaccess_conf: name: ${STACK_NAME}_htaccess_conf_${HTACCESS_CONF_VERSION} file: htaccess.tmpl diff --git a/uploads.ini b/uploads.ini deleted file mode 100644 index a60fde7..0000000 --- a/uploads.ini +++ /dev/null @@ -1,3 +0,0 @@ -file_uploads = On -upload_max_filesize = 256M -post_max_size = 256M diff --git a/uploads.ini.tmpl b/uploads.ini.tmpl new file mode 100644 index 0000000..56fed73 --- /dev/null +++ b/uploads.ini.tmpl @@ -0,0 +1,11 @@ +{{ $upload_max_size := "256M" }} +{{ if ne (env "UPLOAD_MAX_SIZE") "" }} {{ $upload_max_size = env "UPLOAD_MAX_SIZE" }} {{ end }} +{{ $upload_max_time := "30" }} +{{ if ne (env "UPLOAD_MAX_TIME") "" }} {{ $upload_max_time = env "UPLOAD_MAX_TIME" }} {{ end }} + +file_uploads = On +upload_max_filesize = {{ $upload_max_size }} +post_max_size = {{ $upload_max_size }} +memory_limit = {{ $upload_max_size }} +max_execution_time = {{ $upload_max_time }} +max_input_time = {{ $upload_max_time }} \ No newline at end of file