commit f72073bcf5c86a11c328c3d3170281822f2a4a63 parent 5eda7eb9ff26b2a2f05a43e53610d4701820673b Author: MTRNord <MTRNord@users.noreply.github.com> Date: Tue, 21 Apr 2026 20:12:15 +0200 fix timeouts Signed-off-by: MTRNord <MTRNord@users.noreply.github.com> Diffstat:
| M | apps/talos_cluster/mediawiki/apache-vhost.conf | | | 4 | ++++ |
| M | apps/talos_cluster/mediawiki/fpm-pool.conf | | | 3 | +++ |
| M | apps/talos_cluster/mediawiki/php-custom.ini | | | 5 | ++++- |
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/apps/talos_cluster/mediawiki/apache-vhost.conf b/apps/talos_cluster/mediawiki/apache-vhost.conf @@ -15,6 +15,10 @@ RequestHeader set X-Forwarded-For "%{X-Forwarded-For}e" env=forwarded RequestHeader set X-Forwarded-Proto "%{X-Forwarded-Proto}e" env=X-Forwarded-Proto + # Timeouts for long-running imports (900s = 15 min) + TimeOut 900 + ProxyTimeout 900 + RewriteEngine On RewriteRule ^/?wiki(/.*)?$ %{DOCUMENT_ROOT}/index.php [L] RewriteRule ^/?$ %{DOCUMENT_ROOT}/index.php [L] diff --git a/apps/talos_cluster/mediawiki/fpm-pool.conf b/apps/talos_cluster/mediawiki/fpm-pool.conf @@ -11,5 +11,8 @@ pm.min_spare_servers = 2 pm.max_spare_servers = 6 pm.max_requests = 500 +; Request timeout for long-running imports (900s = 15min) +request_terminate_timeout = 900 + ; Pass environment variables to FPM workers clear_env = no diff --git a/apps/talos_cluster/mediawiki/php-custom.ini b/apps/talos_cluster/mediawiki/php-custom.ini @@ -1,7 +1,10 @@ upload_max_filesize = 50M post_max_size = 50M memory_limit = 256M -max_execution_time = 60 +max_execution_time = 900 + +; Socket/default timeouts for remote imports +default_socket_timeout = 300 ; OPcache opcache.enable = 1