Merge pull request #121 from iiab/master

sync from iiab/iiab

roles/httpd/tasks/php-stem.yml

@@ -21,7 +21,7 @@
     remote_src: yes
   when: is_rpi
 
-- name: Download & unpack php-stem.x86.tar to / (not rpi)
+- name: Download & unpack php-stem.x86.tar to / (debian-9 on x86_64 only)
   unarchive:
     src: http://download.iiab.io/packages/php-stem.x64.tar
     dest: /
@@ -29,7 +29,10 @@
     group: root
     #mode: ????
     remote_src: yes
-  when: not is_rpi
+  when: is_debian_9 and (ansible_machine == "x86_64")
+# Presumably fails on Debian 8 & 10?
+# Fails on Debian i686 as of 2018-08-07: https://github.com/iiab/iiab/issues/983
+# Fails on Ubuntu 18.04 as of 2018-07-28: https://github.com/iiab/iiab/issues/829
 
 # No need to do this twice?  Happens later @ https://github.com/iiab/iiab/blob/master/roles/3-base-server/tasks/main.yml#L24-L28
 #- name: Restart apache2 / httpd

roles/kiwix/README.rst

@@ -5,16 +5,19 @@ Kiwix README
 Kiwix develops ZIM file creation & rendering tools for offline action,
 as summarized at: http://wiki.kiwix.org/wiki/Software
 
-We are using the kiwix-serve and kiwix-manage executables to setup and
-render Wikipedia and other web sources in ZIM format.
+Internet-in-a-Box uses the kiwix-serve and kiwix-manage executables (in
+/opt/iiab/kiwix/bin) to set up and render ZIM files such as Wikipedia, and
+other educational materials: http://download.kiwix.org/zim/
 
 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
+- Your ZIM files go in /library/zims/content
+- Your ZIM index files go in directories under /library/zims/index (these index files are increasingly no longer necessary, as most ZIM files produced since 2017 contain an internal search index instead!)
 - 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
+- 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
+Your local ZIM catalog (at /library/zims/library.xml) can be regenerated by running:
+/usr/bin/iiab-make-kiwix-lib
+
+See "How do I add ZIM files, like Wikipedia?" at http://FAQ.IIAB.IO

roles/kiwix/defaults/main.yml

@@ -16,7 +16,8 @@ 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_alias_url: /kiwix
 kiwix_path: "{{ iiab_base }}/kiwix"
 
 # /library/zims contains 3 important things:

roles/kiwix/templates/kiwix.conf.j2

@@ -1,6 +1,4 @@
-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]
+RewriteRule ^{{ kiwix_alias_url }}$ {{ kiwix_url }} [R]
+
+ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }}