Merge pull request #341 from iiab/master

sync from iiab:master

roles/httpd/templates/010-iiab.conf.j2

@@ -38,7 +38,22 @@ 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 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
 
 #
 # KeepAlive: Whether or not to allow persistent connections (more than

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

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

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