From c05585e745e2f95116532b1cb0fe5c0e19978676 Mon Sep 17 00:00:00 2001 From: Arky Date: Mon, 6 Aug 2018 20:47:22 +0700 Subject: [PATCH 1/3] Use Kiwix default URI box.lan/kiwix Enhances Kiwix proxypass settings, updates kiwix readme file. Modifies one variable kiwix_url from /kiwix/ to /kiwix Fixes https://github.com/iiab/iiab/issues/979 --- roles/kiwix/README.rst | 4 ++-- roles/kiwix/defaults/main.yml | 2 +- roles/kiwix/templates/kiwix.conf.j2 | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/kiwix/README.rst b/roles/kiwix/README.rst index e208742c7..308de46d5 100644 --- a/roles/kiwix/README.rst +++ b/roles/kiwix/README.rst @@ -13,7 +13,7 @@ Locations - Your ZIM files are expected to be in /library/zims/content - Your ZIM index files are expected to be in directories under /library/zims/index -- The URL is http://box:3000 +- The URL is http://box.lan/kiwix Your local ZIM catalog (at /library/zims/library.xml) can be -regenerated by running: iiab-make-kiwix-lib +regenerated by running: /usr/bin/iiab-make-kiwix-lib diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index a1425982b..d11d8207d 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -16,7 +16,7 @@ kiwix_src_file_i686: "{{ kiwix_version_i686 }}.tar.gz" kiwix_port: 3000 # Used for Kiwix proxy http://box/kiwix/ -kiwix_url: /kiwix/ +kiwix_url: /kiwix kiwix_path: "{{ iiab_base }}/kiwix" # /library/zims contains 3 important things: diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index a191cdb81..3919b59fb 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -1 +1,6 @@ -ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port }}{{ kiwix_url }} \ No newline at end of file +ProxyPreserveHost On +ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} +ProxyPassReverse {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} + +RewriteEngine on +RewriteRule ^/kiwix$ /kiwix/ [R] From 43747fb1a83843f2ffda1c16d12cea2e43cee26e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 10:42:04 -0400 Subject: [PATCH 2/3] Update kiwix.conf.j2 --- roles/kiwix/templates/kiwix.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index 3919b59fb..59cd3cb7c 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -1,5 +1,5 @@ ProxyPreserveHost On -ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} +ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} ProxyPassReverse {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} RewriteEngine on From 7e5ef15b45a6eb314e232a6932f8415b09da6d18 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 6 Aug 2018 10:54:03 -0400 Subject: [PATCH 3/3] Update README.rst --- roles/kiwix/README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/kiwix/README.rst b/roles/kiwix/README.rst index 308de46d5..839d4c832 100644 --- a/roles/kiwix/README.rst +++ b/roles/kiwix/README.rst @@ -13,7 +13,8 @@ Locations - Your ZIM files are expected to be in /library/zims/content - Your ZIM index files are expected to be in directories under /library/zims/index -- The URL is http://box.lan/kiwix +- The URL is http://box/kiwix or http://box.lan/kiwix (both proxied for AWStats) +- Use URL http://box:3000/kiwix if you want to avoid the proxy Your local ZIM catalog (at /library/zims/library.xml) can be regenerated by running: /usr/bin/iiab-make-kiwix-lib