Merge pull request #119 from iiab/master

sync from iiab/iiab

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:3000
+- 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: iiab-make-kiwix-lib
+regenerated by running: /usr/bin/iiab-make-kiwix-lib

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:

roles/kiwix/templates/kiwix.conf.j2

@@ -1 +1,6 @@
-ProxyPass {{ kiwix_url }}  http://127.0.0.1:{{ kiwix_port }}{{ kiwix_url }}
+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]