From 9bb420fbc85641d3aa4638e026a6b87319ad7e8c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Jan 2020 14:50:52 -0500 Subject: [PATCH 1/6] Restore Apache's "Timeout 120" to 300 sec default --- roles/httpd/templates/010-iiab.conf.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2 index ef2492c36..281cfb49d 100755 --- a/roles/httpd/templates/010-iiab.conf.j2 +++ b/roles/httpd/templates/010-iiab.conf.j2 @@ -38,7 +38,16 @@ ServerTokens OS # # Timeout: The number of seconds before receives and sends time out. # -Timeout 120 +# Timeout 120 +# +# 2020-01-15: To mitigate the worst of Kiwix search timeouts, let's comment out +# the above "Timeout 120" and defer to Apache default "Timeout 300" as set in +# /etc/apache2/apache2.conf +# Let's also raise NGINX's default "proxy_read_timeout 60s;" somewhere like... +# /etc/nginx/nginx.conf or /etc/nginx/server.conf or /etc/nginx/proxy_params and /etc/nginx/conf.d/kiwix-nginx.conf ? +# More background details on this ongoing Kiwix problem: +# https://github.com/iiab/iiab/pull/2063 +# https://github.com/kiwix/kiwix-tools/issues/345 # # KeepAlive: Whether or not to allow persistent connections (more than From 6a3a2a7daa9bfb67915ff01662f42c13e435327f Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Jan 2020 15:15:17 -0500 Subject: [PATCH 2/6] Record @jvonau NGINX timeout suggestions for #2063 --- roles/httpd/templates/010-iiab.conf.j2 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2 index 281cfb49d..6da589413 100755 --- a/roles/httpd/templates/010-iiab.conf.j2 +++ b/roles/httpd/templates/010-iiab.conf.j2 @@ -42,12 +42,18 @@ ServerTokens OS # # 2020-01-15: To mitigate the worst of Kiwix search timeouts, let's comment out # the above "Timeout 120" and defer to Apache default "Timeout 300" as set in -# /etc/apache2/apache2.conf -# Let's also raise NGINX's default "proxy_read_timeout 60s;" somewhere like... -# /etc/nginx/nginx.conf or /etc/nginx/server.conf or /etc/nginx/proxy_params and /etc/nginx/conf.d/kiwix-nginx.conf ? +# /etc/apache2/apache2.conf +# Let's very soon also raise NGINX default "proxy_read_timeout 60s;" within... +# /etc/nginx/nginx.conf OR... +# /etc/nginx/server.conf OR... +# /etc/nginx/proxy_params AND POSSIBLY ALSO... +# /etc/nginx/conf.d/kiwix-nginx.conf +# These 2 NGINX defaults might also need changing on overtaxed IIAB servers...? +# proxy_connect_timeout 60s; # time to answer the door bell +# proxy_send_timeout 60s; # time to accept the request # More background details on this ongoing Kiwix problem: -# https://github.com/iiab/iiab/pull/2063 -# https://github.com/kiwix/kiwix-tools/issues/345 +# https://github.com/iiab/iiab/pull/2063 +# https://github.com/kiwix/kiwix-tools/issues/345 # # KeepAlive: Whether or not to allow persistent connections (more than From 080623f78e0d6d2ee6bea3f50eabe17f067f8fd2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Jan 2020 15:19:50 -0500 Subject: [PATCH 3/6] Update 010-iiab.conf.j2 --- roles/httpd/templates/010-iiab.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/httpd/templates/010-iiab.conf.j2 b/roles/httpd/templates/010-iiab.conf.j2 index 6da589413..30d857515 100755 --- a/roles/httpd/templates/010-iiab.conf.j2 +++ b/roles/httpd/templates/010-iiab.conf.j2 @@ -41,9 +41,9 @@ ServerTokens OS # Timeout 120 # # 2020-01-15: To mitigate the worst of Kiwix search timeouts, let's comment out -# the above "Timeout 120" and defer to Apache default "Timeout 300" as set in +# the above "Timeout 120" and defer to Apache default "Timeout 300" as set in: # /etc/apache2/apache2.conf -# Let's very soon also raise NGINX default "proxy_read_timeout 60s;" within... +# Let's very soon also raise NGINX default "proxy_read_timeout 60s;" within: # /etc/nginx/nginx.conf OR... # /etc/nginx/server.conf OR... # /etc/nginx/proxy_params AND POSSIBLY ALSO... From 8f94703b3021b06263c034b3dd99b40a6c72044f Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Jan 2020 19:42:18 -0500 Subject: [PATCH 4/6] Recommend Ansible 2.8.8 --- scripts/ansible-2.8.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index b80d0c2b6..83e5c1e07 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.8.7" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.8.8" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From caaf417272d29640188ebff4da11356eb18ece0a Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Jan 2020 19:42:49 -0500 Subject: [PATCH 5/6] Recommend Ansible 2.9.3 --- scripts/ansible-2.9.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index 2ed4b4506..f2cd54985 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.9.2" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.9.3" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From cddb2cf83f2b22bc473e6254fddc30b3be6e4e83 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Jan 2020 19:43:09 -0500 Subject: [PATCH 6/6] Recommend Ansible 2.9.3 --- scripts/ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible b/scripts/ansible index bf4ff2197..44ccea0c5 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.9.2" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.9.3" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive