From 37731a8d4f484af6d0adc7565d740dcd1b85a5f3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 7 Aug 2018 17:34:03 -0400 Subject: [PATCH 01/11] Update php-stem.yml --- roles/httpd/tasks/php-stem.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 191872775..9042ab86a 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -29,7 +29,8 @@ group: root #mode: ???? remote_src: yes - when: not is_rpi + when: is_debian and (ansible_machine == "x86_64") +# when: not is_rpi # 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 From 1861876c9c7e0ba19bf776dd285d3bd88d0ac379 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 7 Aug 2018 17:43:34 -0400 Subject: [PATCH 02/11] Update php-stem.yml --- roles/httpd/tasks/php-stem.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 9042ab86a..400f24038 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -30,7 +30,8 @@ #mode: ???? remote_src: yes when: is_debian and (ansible_machine == "x86_64") -# when: not is_rpi +# Fails on Ubuntu 18.04 as of 2018-07-28: https://github.com/iiab/iiab/issues/829 +# Fails on Debian i686 as of 2018-08-07: https://github.com/iiab/iiab/issues/983 # 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 From 24473e19c5781fe6250372ebf318291b6d2667af Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 7 Aug 2018 17:49:05 -0400 Subject: [PATCH 03/11] Update php-stem.yml --- roles/httpd/tasks/php-stem.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 400f24038..62ae82d70 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/roles/httpd/tasks/php-stem.yml @@ -29,9 +29,10 @@ group: root #mode: ???? remote_src: yes - when: is_debian and (ansible_machine == "x86_64") -# Fails on Ubuntu 18.04 as of 2018-07-28: https://github.com/iiab/iiab/issues/829 + 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 From bd9d672bb835c16abcc2b95079b6356c1034c83a Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 7 Aug 2018 17:55:10 -0400 Subject: [PATCH 04/11] Update php-stem.yml --- roles/httpd/tasks/php-stem.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/httpd/tasks/php-stem.yml b/roles/httpd/tasks/php-stem.yml index 62ae82d70..a31c4e064 100644 --- a/roles/httpd/tasks/php-stem.yml +++ b/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: / From 4c64423f16f285342ba2e041f1bb8f1be773c149 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Tue, 7 Aug 2018 18:05:11 -0400 Subject: [PATCH 05/11] remove unneeded directives the Readme is left for others. --- roles/kiwix/defaults/main.yml | 3 ++- roles/kiwix/templates/kiwix.conf.j2 | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index d11d8207d..c6334b8dd 100644 --- a/roles/kiwix/defaults/main.yml +++ b/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: diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index 59cd3cb7c..641c86193 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/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 }} From 44f2f9e8eeddff70b805dfa2627b4c35d5f5884a Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 8 Aug 2018 13:53:56 -0400 Subject: [PATCH 06/11] Rename README-historical.md to README.md.deprecated --- README-historical.md => README.md.deprecated | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README-historical.md => README.md.deprecated (100%) diff --git a/README-historical.md b/README.md.deprecated similarity index 100% rename from README-historical.md rename to README.md.deprecated From bde76eed57f54d27e48b20735e90c9d84a427161 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 8 Aug 2018 15:22:22 -0400 Subject: [PATCH 07/11] Update README.rst --- roles/kiwix/README.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/kiwix/README.rst b/roles/kiwix/README.rst index 839d4c832..58cb21d92 100644 --- a/roles/kiwix/README.rst +++ b/roles/kiwix/README.rst @@ -5,16 +5,17 @@ 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 materials. 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!) - 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 From a80c9043a4571fd1ab096bb77f9b5d52fd931778 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 8 Aug 2018 15:24:40 -0400 Subject: [PATCH 08/11] Update README.rst --- roles/kiwix/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kiwix/README.rst b/roles/kiwix/README.rst index 58cb21d92..f2cc88dbf 100644 --- a/roles/kiwix/README.rst +++ b/roles/kiwix/README.rst @@ -6,8 +6,8 @@ Kiwix develops ZIM file creation & rendering tools for offline action, as summarized at: http://wiki.kiwix.org/wiki/Software 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 materials. +/opt/iiab/kiwix/bin) to set up and render ZIM files such as Wikipedia, and +other educational materials. Locations --------- From 856c54ab05866a44d0c4b4089cda93a1f7563254 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 8 Aug 2018 15:25:56 -0400 Subject: [PATCH 09/11] Update README.rst --- roles/kiwix/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kiwix/README.rst b/roles/kiwix/README.rst index f2cc88dbf..fae57e56a 100644 --- a/roles/kiwix/README.rst +++ b/roles/kiwix/README.rst @@ -7,7 +7,7 @@ as summarized at: http://wiki.kiwix.org/wiki/Software 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. +other educational materials: http://download.kiwix.org/zim/ Locations --------- From d363cdacc799524174eb3c26765b9d1cfd8b8f65 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 8 Aug 2018 16:01:46 -0400 Subject: [PATCH 10/11] Update README.rst --- roles/kiwix/README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/kiwix/README.rst b/roles/kiwix/README.rst index fae57e56a..79e3c827d 100644 --- a/roles/kiwix/README.rst +++ b/roles/kiwix/README.rst @@ -19,3 +19,5 @@ Locations 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 From d599bc8ecc576739d39d06d8a59c4395ecaaa714 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 8 Aug 2018 16:48:26 -0400 Subject: [PATCH 11/11] Update README.rst --- roles/kiwix/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kiwix/README.rst b/roles/kiwix/README.rst index 79e3c827d..0a6aa1741 100644 --- a/roles/kiwix/README.rst +++ b/roles/kiwix/README.rst @@ -13,7 +13,7 @@ Locations --------- - 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!) +- 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