Skip to content

apache proxy for kiwix#585

Merged
holta merged 3 commits intoiiab:masterfrom
tim-moody:kiwix-proxy-12-2
Dec 4, 2017
Merged

apache proxy for kiwix#585
holta merged 3 commits intoiiab:masterfrom
tim-moody:kiwix-proxy-12-2

Conversation

@tim-moody
Copy link
Copy Markdown
Contributor

rough and untested to get it on the table

@holta holta added this to the 6.5-OctNov milestone Dec 2, 2017
@tim-moody
Copy link
Copy Markdown
Contributor Author

pass smoke and function test on debian 9 vm

Please note it does not upgrade existing install as playbook only reinstalls the kiwix exec even on force

@holta
Copy link
Copy Markdown
Member

holta commented Dec 2, 2017

Please note it does not upgrade existing install as playbook only reinstalls the kiwix exec even on force

Kiwix does upgrade itself reliably & completely with "./runtags kiwix" (certainly on Raspbian & Ubuntu 16.04 LTS) if /opt/iiab/kiwix/bin/kiwix-serve is removed per https://github.com/iiab/iiab/blob/master/roles/kiwix/tasks/kiwix_install.yml#L32-L40

This has been tested carefully on Raspbian and Ubuntu 16.04 LTS today and over the past week.

If anybody can reproduce different behavior across Debian or more broadly across multiple OS's please let us know if there's a genuine issue here.

PS Arguably IIAB's too heavy-handed, upgrading services (or at least many of their components) too often, whenever IIAB playbooks are rerun. Example: Ansible's template module does a mandatory upgrade of all files @ https://github.com/tim-moody/iiab/blob/kiwix-proxy-12-2/roles/kiwix/tasks/kiwix_install.yml#L98-L112 for now. In future we can scale this back if nec — e.g. with "force: no" [*] or "when: kiwix_force_install" etc — to prevent the following from being upgraded/overwritten every time:

  • /usr/bin/iiab-make-kiwix-lib
  • /usr/bin/iiab-make-kiwix-lib.py
  • /etc/apache2/sites-available/kiwix.conf

[*] http://docs.ansible.com/ansible/latest/template_module.html

@holta
Copy link
Copy Markdown
Member

holta commented Dec 2, 2017

This PR #585 works on Ubuntu 16.04 LTS — in the sense that the Random button works when clicking on ZIM files @ http://box:3000 — any other things that need testing?

@tim-moody
Copy link
Copy Markdown
Contributor Author

the test is does box/kiwix/ bring up the kiwix home page

@tim-moody
Copy link
Copy Markdown
Contributor Author

iiab-menu has been changed to support this PR, so can now be merged

@holta holta merged commit 77c5626 into iiab:master Dec 4, 2017
@holta
Copy link
Copy Markdown
Member

holta commented Dec 7, 2017

@tim-moody where should we document backward compatibility (presence or absence of kiwixUrl property in config.json determines proxy or no proxy) ?

FYI For All: test this using Test http://box/kiwix/ (trailing slash important!) — noting that all visits to main page http://box menuing system now use this, — in turn uses port 3000 to access ZIM files under the covers.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants