From a5b7f7bb75c0838829abecfecd3173bd3803c056 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Tue, 4 Feb 2020 10:42:00 -0500 Subject: [PATCH 1/2] softcode and increase proxy timeouts for kiwix in nginx --- roles/kiwix/defaults/main.yml | 1 + roles/kiwix/templates/kiwix-nginx.conf | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 992d94c5a..f3aebfb36 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -38,3 +38,4 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml" # - NEW WAY: cd /opt/iiab/iiab; ./runrole --reinstall kiwix # - OLD WAY: rm /opt/iiab/kiwix/bin/kiwix-serve; cd /opt/iiab/iiab; ./runrole kiwix kiwix_force_install: False +kiwix_nginx_timeout: 600 diff --git a/roles/kiwix/templates/kiwix-nginx.conf b/roles/kiwix/templates/kiwix-nginx.conf index c14b82f1a..2c5f96f80 100644 --- a/roles/kiwix/templates/kiwix-nginx.conf +++ b/roles/kiwix/templates/kiwix-nginx.conf @@ -1,3 +1,12 @@ location /kiwix { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $http_host; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_connect_timeout {{ kiwix_nginx_timeout }}; + proxy_send_timeout {{ kiwix_nginx_timeout }}; + proxy_read_timeout {{ kiwix_nginx_timeout }}; + send_timeout {{ kiwix_nginx_timeout }}; proxy_pass http://127.0.0.1:3000; + } From 27c948c5dae119556ba6bcd15d5627b890ecb8a2 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Tue, 4 Feb 2020 11:12:07 -0500 Subject: [PATCH 2/2] add softcoded threads while we're at it --- roles/kiwix/defaults/main.yml | 1 + roles/kiwix/templates/kiwix-serve.service.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index f3aebfb36..0801516e0 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -39,3 +39,4 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml" # - OLD WAY: rm /opt/iiab/kiwix/bin/kiwix-serve; cd /opt/iiab/iiab; ./runrole kiwix kiwix_force_install: False kiwix_nginx_timeout: 600 +kiwix_threads: 4 diff --git a/roles/kiwix/templates/kiwix-serve.service.j2 b/roles/kiwix/templates/kiwix-serve.service.j2 index 14dc96bc8..30157bbac 100644 --- a/roles/kiwix/templates/kiwix-serve.service.j2 +++ b/roles/kiwix/templates/kiwix-serve.service.j2 @@ -4,7 +4,7 @@ After=syslog.target network.target local-fs.target [Service] Type=forking -ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }} +ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }} --threads {{ kiwix_threads }} TimeoutStartSec=180 Restart=on-abort RestartSec=5s