From cc0f3472f66074a83eedb2e29b8987aa885ab051 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Mon, 4 Mar 2024 19:47:53 -0400 Subject: [PATCH] Use default NGinx config values in sample.env. --- sample-dev.env | 32 ++++++++++++++++---------------- sample.env | 29 ++++++++++++++--------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/sample-dev.env b/sample-dev.env index 8d942d7c7..e5e70aba3 100644 --- a/sample-dev.env +++ b/sample-dev.env @@ -155,7 +155,22 @@ RESTART_POLICY=unless-stopped PHP_MEMORY_LIMIT=256M PHP_POST_MAX_SIZE=128M PHP_UPLOAD_MAX_FILESIZE=128M -PHP_MAX_EXECUTION_TIME=30 +PHP_MAX_EXECUTION_TIME=3600 +PHP_MAX_INPUT_TIME=3600 +PHP_DEFAULT_SOCKET_TIMEOUT=3600 +PHP_PROCESS_CONTROL_TIMEOUT=3600 +PHP_REQUEST_TERMINATE_TIMEOUT=3600 +NGINX_CLIENT_BODY_TIMEOUT=3600s +NGINX_FASTCGI_CONNECT_TIMEOUT=3600s +NGINX_FASTCGI_READ_TIMEOUT=3600s +NGINX_FASTCGI_SEND_TIMEOUT=3600s +NGINX_KEEPALIVE_TIMEOUT=3600s +NGINX_LINGERING_TIMEOUT=5s +NGINX_PROXY_CONNECT_TIMEOUT=3600s +NGINX_PROXY_READ_TIMEOUT=3600s +NGINX_PROXY_SEND_TIMEOUT=3600s +NGINX_SEND_TIMEOUT=3600s + # If you're just demoing or are starting from scratch, use this. INSTALL_EXISTING_CONFIG=false @@ -205,18 +220,3 @@ CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy PUBLIC_FILES_TAR_DUMP_PATH=. -PHP_MAX_EXECUTION_TIME=3600 -PHP_MAX_INPUT_TIME=3600 -PHP_DEFAULT_SOCKET_TIMEOUT=3600 -PHP_PROCESS_CONTROL_TIMEOUT=3600 -PHP_REQUEST_TERMINATE_TIMEOUT=3600 -NGINX_CLIENT_BODY_TIMEOUT=3600s -NGINX_FASTCGI_CONNECT_TIMEOUT=3600s -NGINX_FASTCGI_READ_TIMEOUT=3600s -NGINX_FASTCGI_SEND_TIMEOUT=3600s -NGINX_KEEPALIVE_TIMEOUT=3600s -NGINX_LINGERING_TIMEOUT=5s -NGINX_PROXY_CONNECT_TIMEOUT=3600s -NGINX_PROXY_READ_TIMEOUT=3600s -NGINX_PROXY_SEND_TIMEOUT=3600s -NGINX_SEND_TIMEOUT=3600s diff --git a/sample.env b/sample.env index 84bade4d2..f45df2458 100644 --- a/sample.env +++ b/sample.env @@ -156,6 +156,20 @@ PHP_MEMORY_LIMIT=256M PHP_POST_MAX_SIZE=128M PHP_UPLOAD_MAX_FILESIZE=128M PHP_MAX_EXECUTION_TIME=30 +PHP_MAX_INPUT_TIME=60 +PHP_DEFAULT_SOCKET_TIMEOUT=60 +PHP_PROCESS_CONTROL_TIMEOUT=60 +PHP_REQUEST_TERMINATE_TIMEOUT=60 +NGINX_CLIENT_BODY_TIMEOUT=60s +NGINX_FASTCGI_CONNECT_TIMEOUT=60s +NGINX_FASTCGI_READ_TIMEOUT=60s +NGINX_FASTCGI_SEND_TIMEOUT=60s +NGINX_KEEPALIVE_TIMEOUT=75s +NGINX_LINGERING_TIMEOUT=5s +NGINX_PROXY_CONNECT_TIMEOUT=60s +NGINX_PROXY_READ_TIMEOUT=60s +NGINX_PROXY_SEND_TIMEOUT=60s +NGINX_SEND_TIMEOUT=60s # If you're just demoing or are starting from scratch, use this. INSTALL_EXISTING_CONFIG=false @@ -205,18 +219,3 @@ CANTALOUPE_HTTPSOURCE_LOOKUP_STRATEGY=BasicLookupStrategy PUBLIC_FILES_TAR_DUMP_PATH=. -PHP_MAX_EXECUTION_TIME=30 -PHP_MAX_INPUT_TIME=60 -PHP_DEFAULT_SOCKET_TIMEOUT=60 -PHP_PROCESS_CONTROL_TIMEOUT=60 -PHP_REQUEST_TERMINATE_TIMEOUT=60 -NGINX_CLIENT_BODY_TIMEOUT=60s -NGINX_FASTCGI_CONNECT_TIMEOUT=60s -NGINX_FASTCGI_READ_TIMEOUT=60s -NGINX_FASTCGI_SEND_TIMEOUT=60s -NGINX_KEEPALIVE_TIMEOUT=60s -NGINX_LINGERING_TIMEOUT=5s -NGINX_PROXY_CONNECT_TIMEOUT=60s -NGINX_PROXY_READ_TIMEOUT=60s -NGINX_PROXY_SEND_TIMEOUT=60s -NGINX_SEND_TIMEOUT=60s