From 309ee2156f979f613fafbc6cb85d16ae52058a5a Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 12:43:22 -0400 Subject: [PATCH 01/72] Update README.rst --- roles/calibre-web/README.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 3b2efca1a..ba1b84ab2 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -92,6 +92,8 @@ Known Issues * Trying to access an empty public bookshelf causes a system error. +* It's sometime impossible to set the language of an e-book: `#1040 `_ `janeczku/calibre-web#593 `_ + * As of August 2018, calibre-web doesn't yet include Calibre's e-book conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows teachers to convert between PDF, epub, txt etc — to permit reading on a wider @@ -99,4 +101,4 @@ Known Issues * calibre-web does not currently use version numbers, so glitches might occasionally arise using its master branch. Please assist us in reporting - issues here, if they do arise: https://github.com/janeczku/calibre-web/issues + serious issues here: https://github.com/janeczku/calibre-web/issues From 4db8cdba32a9bfc3cabcc25cbf182a326a06d599 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 12:55:11 -0400 Subject: [PATCH 02/72] Update README.rst --- roles/calibre-web/README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index ba1b84ab2..d07c8ddd5 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -94,6 +94,8 @@ Known Issues * It's sometime impossible to set the language of an e-book: `#1040 `_ `janeczku/calibre-web#593 `_ +* http://192.168.0.x:8083 does not work, even when ``services_externally_visible: true`` as a result of `iptables `_. However http://192.168.0.x/books does work. + * As of August 2018, calibre-web doesn't yet include Calibre's e-book conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows teachers to convert between PDF, epub, txt etc — to permit reading on a wider From 458331f7f5311504d20138c2d5a228cba53df78f Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 13:27:09 -0400 Subject: [PATCH 03/72] Update README.rst --- roles/calibre-web/README.rst | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index d07c8ddd5..3ce5241f5 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -92,15 +92,21 @@ Known Issues * Trying to access an empty public bookshelf causes a system error. -* It's sometime impossible to set the language of an e-book: `#1040 `_ `janeczku/calibre-web#593 `_ - -* http://192.168.0.x:8083 does not work, even when ``services_externally_visible: true`` as a result of `iptables `_. However http://192.168.0.x/books does work. +* It's sometime impossible to set the language of an e-book: `#1040 `_ + `janeczku/calibre-web#593 `_ * As of August 2018, calibre-web doesn't yet include Calibre's e-book conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows teachers to convert between PDF, epub, txt etc — to permit reading on a wider array client devices and client software). +* http://192.168.0.x:8083 does not work, as a result of `iptables `_, + even when ``services_externally_visible: true``. This is fixable, but perhaps + it's not a priority, as {http://192.168.0.x/books, http://box/books, etc} URL's + all work. + * calibre-web does not currently use version numbers, so glitches might - occasionally arise using its master branch. Please assist us in reporting - serious issues here: https://github.com/janeczku/calibre-web/issues + occasionally arise using its master branch. + +* *Please assist us in reporting serious issues here:* + https://github.com/janeczku/calibre-web/issues From 0832714cae7b57f013e9eba1adab746b723fcafd Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 17:06:46 -0400 Subject: [PATCH 04/72] Update README.rst --- roles/calibre-web/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 3ce5241f5..b940116a8 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -57,8 +57,8 @@ See also:: /library/calibre-web/metadata_db_prefs_backup.json -Back Up Your Content --------------------- +Backup +------ Please back up the entire folder ``/library/calibre-web`` before upgrading — as it contains your calibre-web content **and** settings! From f1d54a7ef542d325ae35e8d095197b61f409adc0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 17:12:54 -0400 Subject: [PATCH 05/72] Update README.rst --- roles/calibre-web/README.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index b940116a8..2ff4695ff 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -70,8 +70,9 @@ Reinstalling calibre-web automatically upgrades to the latest version. Back up your content **and** settings before reinstalling, as explained above. -**Move your /library/calibre-web/metadata.db if you're sure you want to install -a bare/minimal metadata.db and force all settings to the default. Then run**:: +**Move your /library/calibre-web/metadata.db if you're sure you want to +reinstall a bare/minimal metadata.db and force all settings to the default. +Then run**:: cd /opt/iiab/iiab ./runrole calibre-web From b52fca117514073d00a0428b5dd244e8ee992dad Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 17:14:16 -0400 Subject: [PATCH 06/72] Update README.rst --- roles/calibre-web/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 2ff4695ff..32ac5aafa 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -57,8 +57,8 @@ See also:: /library/calibre-web/metadata_db_prefs_backup.json -Backup ------- +Back Up Everything +------------------ Please back up the entire folder ``/library/calibre-web`` before upgrading — as it contains your calibre-web content **and** settings! From 8f5d3077774dfded9323089e60356e377ca3ed26 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 17:26:45 -0400 Subject: [PATCH 07/72] Update README.rst --- roles/calibre-web/README.rst | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 32ac5aafa..2ae5d5c17 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -3,14 +3,14 @@ Calibre-Web README ================== Calibre-Web provides a clean interface for browsing, reading and downloading -e-books using an existing Calibre database. Teachers can add upload e-books, -adjust e-book metadata, and create custom book collections ("bookshelves"): +e-books using an existing Calibre database. Teachers can upload e-books, +adjust e-book metadata, and create custom e-book collections ("bookshelves"): https://github.com/janeczku/calibre-web#about -This Ansible role installs Calibre-Web as part of your Internet-in-a-Box, as a -possible alternative to Calibre (we'll call it 'calibre-web' from here down, -noting that ``calibreweb_*`` variables do not include the dash, per Ansible -recommendations). +This Ansible role installs Calibre-Web as part of your Internet-in-a-Box (IIAB) +as a possible alternative to Calibre (we'll call it 'calibre-web' from here +down, noting that ``calibreweb_*`` variables do not include the dash, per +Ansible recommendations). Using It -------- @@ -24,7 +24,7 @@ whereas teachers add books using an administrative account, as follows:: Password: changeme If the default configuration is not found, the calibre-web server creates a -new settings file with calibre-web's own administrative account default:: +new settings file with calibre-web's own default administrative account:: Username: admin Password: admin123 @@ -42,7 +42,7 @@ You can manage the backend calibre-web server with these systemd commands:: Configuration ------------- -To configure calibre-web, login as user 'Admin' then click 'Admin' on top. +To configure calibre-web, log in as user 'Admin' then click 'Admin' on top. Check 'Configuration' options near the bottom of the page. Critical settings are stored in:: @@ -66,18 +66,19 @@ as it contains your calibre-web content **and** settings! Upgrading --------- -Reinstalling calibre-web automatically upgrades to the latest version. +Reinstalling calibre-web automatically upgrades to the latest version if your +Internet-in-a-Box (IIAB) is online. -Back up your content **and** settings before reinstalling, as explained above. +But first: back up your content **and** settings, as explained above. -**Move your /library/calibre-web/metadata.db if you're sure you want to -reinstall a bare/minimal metadata.db and force all settings to the default. -Then run**:: +**Then move your /library/calibre-web/metadata.db out of the way, if you're +sure you want to (re)install bare/minimal metadata, and force all settings to +the default. Then run**:: cd /opt/iiab/iiab ./runrole calibre-web -Or, to reinstall all of Internet-in-a-Box:: +Or, to reinstall all of IIAB:: cd /opt/iiab/iiab ./iiab-install --reinstall From 3624404f6c70b0c9fef5f6fc5ff127149037c481 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 17:35:47 -0400 Subject: [PATCH 08/72] Update README.rst --- roles/calibre-web/README.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 2ae5d5c17..9aacd1556 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -94,21 +94,21 @@ Known Issues * Trying to access an empty public bookshelf causes a system error. -* It's sometime impossible to set the language of an e-book: `#1040 `_ +* It's sometimes impossible to set the language of an e-book: `#1040 `_ `janeczku/calibre-web#593 `_ * As of August 2018, calibre-web doesn't yet include Calibre's e-book conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows - teachers to convert between PDF, epub, txt etc — to permit reading on a wider - array client devices and client software). + teachers to convert between PDF, EPUB, HTML, TXT etc — to permit reading on a + wider array client devices and client software). * http://192.168.0.x:8083 does not work, as a result of `iptables `_, even when ``services_externally_visible: true``. This is fixable, but perhaps - it's not a priority, as {http://192.168.0.x/books, http://box/books, etc} URL's - all work. + it's not a priority, as URL's like {http://192.168.0.x/books, + http://10.8.0.x/books, http://127.0.0.1/books and http://box/books} all work. * calibre-web does not currently use version numbers, so glitches might - occasionally arise using its master branch. + occasionally arise, when changes impact its master branch without warning. * *Please assist us in reporting serious issues here:* https://github.com/janeczku/calibre-web/issues From 46df5157f0b8a34ffc8f77be220a82a016c57c3f Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 17:42:22 -0400 Subject: [PATCH 09/72] Update README.rst --- roles/calibre-web/README.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 9aacd1556..8cd493390 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -72,8 +72,8 @@ Internet-in-a-Box (IIAB) is online. But first: back up your content **and** settings, as explained above. **Then move your /library/calibre-web/metadata.db out of the way, if you're -sure you want to (re)install bare/minimal metadata, and force all settings to -the default. Then run**:: +sure you want to (re)install bare/minimal metadata, and force all calibre-web +settings to the default. Then run**:: cd /opt/iiab/iiab ./runrole calibre-web @@ -108,7 +108,8 @@ Known Issues http://10.8.0.x/books, http://127.0.0.1/books and http://box/books} all work. * calibre-web does not currently use version numbers, so glitches might - occasionally arise, when changes impact its master branch without warning. + occasionally arise, when upstream developers change its master branch without + warning. * *Please assist us in reporting serious issues here:* https://github.com/janeczku/calibre-web/issues From 4a9ea88babcf36342c64a828508e60aa3a1b1770 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 29 Aug 2018 17:45:01 -0400 Subject: [PATCH 10/72] Update README.rst --- roles/calibre-web/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 8cd493390..b2527156a 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -94,8 +94,8 @@ Known Issues * Trying to access an empty public bookshelf causes a system error. -* It's sometimes impossible to set the language of an e-book: `#1040 `_ - `janeczku/calibre-web#593 `_ +* As of August 2018, it's sometimes impossible to set the language of an + e-book: `#1040 `_, `janeczku/calibre-web#593 `_ * As of August 2018, calibre-web doesn't yet include Calibre's e-book conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows From 450eabf93934739322e5efe42dd258c68188eb38 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 14:27:50 +0000 Subject: [PATCH 11/72] freeze calibre at 3.30 --- roles/calibre/defaults/main.yml | 2 ++ roles/calibre/tasks/debs.yml | 3 ++- roles/calibre/tasks/main.yml | 15 ++++++++++++++- scripts/calibre-install-3.30-rpi.sh | 17 +++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 scripts/calibre-install-3.30-rpi.sh diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index a89171f8b..5c4d713d2 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -19,6 +19,8 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" +calibre_deb_url: http://download.iiab.io/packages/ + # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True # Enable unstable .deb's, not just testing .deb's: (moved to /etc/iiab/local_vars.yml & /opt/iiab/iiab/vars/default_vars.yml) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 23504f511..dc5134c4b 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -30,7 +30,8 @@ - name: Upgrade to latest Calibre using .deb's from testing (rpi) #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x - command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) + #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) + command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index ec8b8e62a..85ac51f0d 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -12,7 +12,20 @@ with_items: - calibre - calibre-bin - when: internet_available and (not calib_executable.stat.exists) + when: internet_available and not is_rpi and (not calib_executable.stat.exists) + +- name: Download Calibre 3.30 (RPi) + get_url: + url: "{{ calibre_deb_url }}/{{ item }}.deb" + dest: "{{ downloads_dir }}/{{ item }}.deb" + mode: 0755 + force: no + backup: no + timeout: "{{ download_timeout }}" + with_items: + - calibre + - calibre-bin + when: internet_available and is_rpi - name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml diff --git a/scripts/calibre-install-3.30-rpi.sh b/scripts/calibre-install-3.30-rpi.sh new file mode 100755 index 000000000..b4387401d --- /dev/null +++ b/scripts/calibre-install-3.30-rpi.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical +# breakthrough possible! +# +# Might break future updates; you have been warned. +# SEE NOTES AT TOP OF scripts/calibre-install-packages.sh + +export DEBIAN_FRONTEND=noninteractive +# Prepares to update to latest from raspbian testing +echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list +apt update +apt -y install /opt/iiab/downloads/calibre*.deb +#sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Removes last line +rm /etc/apt/sources.list.d/rpi-testing.list +# Clears the cache of rpi/testing +apt update From 0343d3bb0c296fd3166356adcea58b084d95044f Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 14:51:49 +0000 Subject: [PATCH 12/72] use full calibre package names --- roles/calibre/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 85ac51f0d..4bcc8939a 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -23,8 +23,8 @@ backup: no timeout: "{{ download_timeout }}" with_items: - - calibre - - calibre-bin + - calibre_3.30.0+dfsg-1_all + - calibre-bin_3.30.0+dfsg-1_armhf when: internet_available and is_rpi - name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) From 25cb17584b50aef304df3b801e13c3f47237d83d Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 15:05:03 +0000 Subject: [PATCH 13/72] use deb.yml even if calibre exists on RPi --- roles/calibre/tasks/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 4bcc8939a..f7cb27caa 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -27,9 +27,13 @@ - calibre-bin_3.30.0+dfsg-1_armhf when: internet_available and is_rpi +- name: Install Calibre 3.30 .debs on RPi + include_tasks: debs.yml + when: calibre_via_debs and is_rpi + - name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml - when: calibre_via_debs and (not calib_executable.stat.exists) + when: calibre_via_debs and not is_rpi and (not calib_executable.stat.exists) - name: Install Calibre via calibre-installer.py IF calibre_via_python (AND /usr/bin/calibre WAS MISSING) include_tasks: py-installer.yml From 975f8e787fa8d7170ab6520a5d55cf8423ab8848 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:04:31 +0000 Subject: [PATCH 14/72] softcode calibre version --- roles/calibre/defaults/main.yml | 3 +++ roles/calibre/tasks/main.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 5c4d713d2..3c67e310d 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -20,6 +20,9 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" calibre_deb_url: http://download.iiab.io/packages/ +#calibre_3.30.0+dfsg-1_all +#calibre-bin_3.30.0+dfsg-1_armhf +calibre_deb_version: _3.30.0+dfsg-1 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index f7cb27caa..9be822a0e 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -23,8 +23,8 @@ backup: no timeout: "{{ download_timeout }}" with_items: - - calibre_3.30.0+dfsg-1_all - - calibre-bin_3.30.0+dfsg-1_armhf + - calibre{{ calibre_deb_version }}_all + - calibre-bin{{ calibre_deb_version }}_armhf when: internet_available and is_rpi - name: Install Calibre 3.30 .debs on RPi From 86ba6631aa2583868111f0753d9ecbf5c1a0328a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:13:31 +0000 Subject: [PATCH 15/72] update task name --- roles/calibre/tasks/debs.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index dc5134c4b..1744c2e21 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -27,10 +27,13 @@ # command: scripts/calibre-install-latest.sh # NECESSARY since Calibre 3.24 (BEWARE installing libc6 will prevent boot in RPi Zero W, i.e. if calibre-install-packages.sh isn't run above!) # when: is_rpi and internet_available -- name: Upgrade to latest Calibre using .deb's from testing (rpi) +#- name: Upgrade to latest Calibre using .deb's from testing (rpi) #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) +# when: is_rpi and internet_available + +- name: Upgrade to Calibre 3.30 while using addional .deb's from testing (rpi) command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available From 58ba19c772431d889e3f39233211d4d7f0e91242 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:20:32 +0000 Subject: [PATCH 16/72] use calibre_deb_version in task name --- roles/calibre/tasks/debs.yml | 2 +- roles/calibre/tasks/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 1744c2e21..b6ea1010b 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,7 +33,7 @@ #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Upgrade to Calibre 3.30 while using addional .deb's from testing (rpi) +- name: Upgrade to Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 9be822a0e..764e87643 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -14,7 +14,7 @@ - calibre-bin when: internet_available and not is_rpi and (not calib_executable.stat.exists) -- name: Download Calibre 3.30 (RPi) +- name: Download Calibre {{ calibre_deb_version }} (RPi) get_url: url: "{{ calibre_deb_url }}/{{ item }}.deb" dest: "{{ downloads_dir }}/{{ item }}.deb" @@ -27,7 +27,7 @@ - calibre-bin{{ calibre_deb_version }}_armhf when: internet_available and is_rpi -- name: Install Calibre 3.30 .debs on RPi +- name: Install Calibre .debs on RPi include_tasks: debs.yml when: calibre_via_debs and is_rpi From 6fdf346c3511cb30caa53e4523e845cf4a741d23 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 12:30:40 -0400 Subject: [PATCH 17/72] kiwix-tools 0.6.0 -> 0.6.1 --- roles/kiwix/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index c6334b8dd..d9f815822 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -1,9 +1,9 @@ # Which kiwix-tools to download from http://download.iiab.io/packages/ # As obtained from http://download.kiwix.org/release/kiwix-tools/ or http://download.kiwix.org/nightly/ -kiwix_version_armhf: "kiwix-tools_linux-armhf-0.6.0" -kiwix_version_linux64: "kiwix-tools_linux-x86_64-0.6.0" -kiwix_version_i686: "kiwix-tools_linux-i586-0.6.0" +kiwix_version_armhf: "kiwix-tools_linux-armhf-0.6.1" +kiwix_version_linux64: "kiwix-tools_linux-x86_64-0.6.1" +kiwix_version_i686: "kiwix-tools_linux-i586-0.6.1" # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2" # v0.9 for i686 published May 2014 ("use it to test legacy ZIM content") # v0.10 for i686 published Oct 2016 ("experimental") REPLACED IN EARLY 2018, thx to Matthieu Gautier: From a012b099f0f12d16f23f1777db55dcd6e8d5cf79 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:42:41 +0000 Subject: [PATCH 18/72] use pinned --- roles/calibre/tasks/debs.yml | 4 ++-- roles/calibre/tasks/main.yml | 2 +- ...ibre-install-3.30-rpi.sh => calibre-install-pinned-rpi.sh} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename scripts/{calibre-install-3.30-rpi.sh => calibre-install-pinned-rpi.sh} (100%) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index b6ea1010b..1f7e844f1 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,8 +33,8 @@ #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Upgrade to Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) - command: scripts/calibre-install-3.30-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 +- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) + command: scripts/calibre-install-pinned-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 764e87643..8b5c97b2a 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -14,7 +14,7 @@ - calibre-bin when: internet_available and not is_rpi and (not calib_executable.stat.exists) -- name: Download Calibre {{ calibre_deb_version }} (RPi) +- name: Download pinned Calibre {{ calibre_deb_version }} (RPi) get_url: url: "{{ calibre_deb_url }}/{{ item }}.deb" dest: "{{ downloads_dir }}/{{ item }}.deb" diff --git a/scripts/calibre-install-3.30-rpi.sh b/scripts/calibre-install-pinned-rpi.sh similarity index 100% rename from scripts/calibre-install-3.30-rpi.sh rename to scripts/calibre-install-pinned-rpi.sh From 23dd0fccb29202647ac4dec7255dd0dd52d7c066 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 30 Aug 2018 16:58:37 +0000 Subject: [PATCH 19/72] it typo --- roles/calibre/tasks/debs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 1f7e844f1..d32674072 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,7 +33,7 @@ #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using addional .deb's from testing (rpi) +- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 when: is_rpi and internet_available From ee9338cdba334136696ec52de36d71214a8589a1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:24:08 -0400 Subject: [PATCH 20/72] Update calibre-install-pinned-rpi.sh --- scripts/calibre-install-pinned-rpi.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/calibre-install-pinned-rpi.sh b/scripts/calibre-install-pinned-rpi.sh index b4387401d..c0dc408a5 100755 --- a/scripts/calibre-install-pinned-rpi.sh +++ b/scripts/calibre-install-pinned-rpi.sh @@ -10,6 +10,7 @@ export DEBIAN_FRONTEND=noninteractive # Prepares to update to latest from raspbian testing echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list apt update +# @jvonau explains that stale .deb's should be avoided as: "apt will pick the highest version to install after churning a bit..." apt -y install /opt/iiab/downloads/calibre*.deb #sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Removes last line rm /etc/apt/sources.list.d/rpi-testing.list From c0526a74e0e9edce327c220a337c30a489abae8d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:26:19 -0400 Subject: [PATCH 21/72] Update debs.yml --- roles/calibre/tasks/debs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index d32674072..2d9b3a0e5 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -34,7 +34,7 @@ # when: is_rpi and internet_available - name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) - command: scripts/calibre-install-pinned-rpi.sh # REQUIRED for Calibre 3.30 on 2018-08-30 + command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available - name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) From 10dfd0021e5576db47ecbd40c7ec570dd3de48cc Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:27:45 -0400 Subject: [PATCH 22/72] Update debs.yml --- roles/calibre/tasks/debs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 2d9b3a0e5..98dbebbc6 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -28,9 +28,9 @@ # when: is_rpi and internet_available #- name: Upgrade to latest Calibre using .deb's from testing (rpi) - #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh - #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x - #command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) +# #command: scripts/calibre-install-latest-rpi-plus.sh # WORKS for Calibre 3.27.1 on 2018-07-22 (#948 -> PR #950) THO NOT BOOTABLE IN Zero W (#952). Similar to Calibre 3.24.x & 3.25 in June 2018, which had used calibre-install-packages.sh then Debian's own calibre-install-latest.sh +# #command: scripts/calibre-install-latest-rpi.sh # WORKS for Calibre 3.28 on 2018-07-26 (PR #971). Likewise for Calibre 3.26.x +# command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available - name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) From 3248ab0bfa07facedec99b62729d2072c3190647 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 13:30:07 -0400 Subject: [PATCH 23/72] Update main.yml --- roles/calibre/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 3c67e310d..6a068d101 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -22,7 +22,7 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages/ #calibre_3.30.0+dfsg-1_all #calibre-bin_3.30.0+dfsg-1_armhf -calibre_deb_version: _3.30.0+dfsg-1 +calibre_deb_version: 3.30.0 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 74310e73f2295a98e1cb7bd99c8dfcc70429124c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:14:15 -0400 Subject: [PATCH 24/72] Update main.yml --- roles/calibre/tasks/main.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index 8b5c97b2a..f2adfef0d 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -14,26 +14,9 @@ - calibre-bin when: internet_available and not is_rpi and (not calib_executable.stat.exists) -- name: Download pinned Calibre {{ calibre_deb_version }} (RPi) - get_url: - url: "{{ calibre_deb_url }}/{{ item }}.deb" - dest: "{{ downloads_dir }}/{{ item }}.deb" - mode: 0755 - force: no - backup: no - timeout: "{{ download_timeout }}" - with_items: - - calibre{{ calibre_deb_version }}_all - - calibre-bin{{ calibre_deb_version }}_armhf - when: internet_available and is_rpi - -- name: Install Calibre .debs on RPi +- name: Install Calibre .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml - when: calibre_via_debs and is_rpi - -- name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) - include_tasks: debs.yml - when: calibre_via_debs and not is_rpi and (not calib_executable.stat.exists) + when: calibre_via_debs and (not calib_executable.stat.exists) - name: Install Calibre via calibre-installer.py IF calibre_via_python (AND /usr/bin/calibre WAS MISSING) include_tasks: py-installer.yml From f09ed0c0ecc2b38a7ddcced23b135f974a5f5cbe Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:16:46 -0400 Subject: [PATCH 25/72] Update debs.yml --- roles/calibre/tasks/debs.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 98dbebbc6..4bc895b84 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,6 +33,19 @@ # command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available +- name: Download PINNED version {{ calibre_deb_version }} of calibre & calibre-bin (rpi) + get_url: + url: "{{ calibre_deb_url }}/{{ item }}" + dest: "{{ downloads_dir }}/{{ item }}" + mode: 0644 + #force: no + #backup: no + timeout: "{{ download_timeout }}" + with_items: + - calibre_{{ calibre_deb_version }}+dfsg-1_all.deb + - calibre-bin_{{ calibre_deb_version }}+dfsg-1_armhf.deb + when: is_rpi and internet_available + - name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available From 48503c6a8297af8147141421c169100eeb0dd975 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:42:05 -0400 Subject: [PATCH 26/72] Python path: /usr/local/osm//... -> /usr/local/osm/... --- roles/osm/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index a9ed97c62..83a2840c4 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -87,12 +87,14 @@ - name: Set osm_path (redhat) set_fact: - osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" + #osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" + osm_path: "{{ osm_venv }}{{ python_path }}/iiab" when: osm_enabled and is_redhat - name: Set osm_path (debuntu) set_fact: - osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" + #osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" + osm_path: "{{ osm_venv }}lib/python2.7/site-packages/iiab" when: osm_enabled and is_debuntu - name: Point wsgi to virtual environment (all OS's) From 3cdbccf5346b900318baff0dc9c952ec2190284b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:46:13 -0400 Subject: [PATCH 27/72] Update osm.conf.j2 --- roles/osm/templates/osm.conf.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/osm/templates/osm.conf.j2 b/roles/osm/templates/osm.conf.j2 index 317648208..735d3d765 100644 --- a/roles/osm/templates/osm.conf.j2 +++ b/roles/osm/templates/osm.conf.j2 @@ -5,9 +5,12 @@ XSendFilePath / WSGIScriptAlias /iiab {{ doc_root }}/osm.wsgi +# For old bitmap/raster tileset Alias /iiabstatic {{ osm_path }}/static Alias /osm {{ osm_path }}/static -Alias /maps {{ osm_path }}/static + +# For new vector tileset, as documents @ http://download.iiab.io/content/OSM/vector-tiles/ +Alias /maps /library/www/html/modules/en-osm-omt-min/ require all granted From cc71985bc402249a5b3576a935fb286d313a8c70 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 15:08:55 -0400 Subject: [PATCH 28/72] Update osm.conf.j2 --- roles/osm/templates/osm.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm/templates/osm.conf.j2 b/roles/osm/templates/osm.conf.j2 index 735d3d765..806c03305 100644 --- a/roles/osm/templates/osm.conf.j2 +++ b/roles/osm/templates/osm.conf.j2 @@ -7,10 +7,10 @@ WSGIScriptAlias /iiab {{ doc_root }}/osm.wsgi # For old bitmap/raster tileset Alias /iiabstatic {{ osm_path }}/static -Alias /osm {{ osm_path }}/static # For new vector tileset, as documents @ http://download.iiab.io/content/OSM/vector-tiles/ Alias /maps /library/www/html/modules/en-osm-omt-min/ +Alias /osm /library/www/html/modules/en-osm-omt-min/ require all granted From eb26b93490c35a6c837ef78fc343c6b4e86b68df Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 15:12:11 -0400 Subject: [PATCH 29/72] Update osm.conf.j2 --- roles/osm/templates/osm.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm/templates/osm.conf.j2 b/roles/osm/templates/osm.conf.j2 index 806c03305..dea0ab4e2 100644 --- a/roles/osm/templates/osm.conf.j2 +++ b/roles/osm/templates/osm.conf.j2 @@ -8,7 +8,7 @@ WSGIScriptAlias /iiab {{ doc_root }}/osm.wsgi # For old bitmap/raster tileset Alias /iiabstatic {{ osm_path }}/static -# For new vector tileset, as documents @ http://download.iiab.io/content/OSM/vector-tiles/ +# For new vector tileset, as documented @ http://FAQ.IIAB.IO ("How do I add zoomable maps for my region? ") & http://download.iiab.io/content/OSM/vector-tiles/ Alias /maps /library/www/html/modules/en-osm-omt-min/ Alias /osm /library/www/html/modules/en-osm-omt-min/ From 4126ad71724be12b2d0b305f2896bd570bef3d3b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 15:52:24 -0400 Subject: [PATCH 30/72] Update debs.yml --- roles/calibre/tasks/debs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 4bc895b84..ed55c4c7a 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -46,14 +46,14 @@ - calibre-bin_{{ calibre_deb_version }}+dfsg-1_armhf.deb when: is_rpi and internet_available -- name: Upgrade to pinned Calibre {{ calibre_deb_version }} while using additional .deb's from testing (rpi) +- name: Install/Upgrade both, to PINNED version {{ calibre_deb_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available -- name: Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) +- name: Install/Upgrade to Calibre testing .deb's - target Ubuntu 16.04 (not rpi and not ubuntu_18) command: scripts/calibre-install-latest.sh when: not is_rpi and not is_ubuntu_18 and internet_available -- name: Upgrade to Calibre unstable .deb's IF calibre_unstable_debs +- name: Install/Upgrade to Calibre unstable .deb's IF calibre_unstable_debs command: scripts/calibre-install-unstable.sh when: calibre_unstable_debs and internet_available From f8d422e0680beb6ad41ed14adf0403b627bc330a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:03:37 -0400 Subject: [PATCH 31/72] Update main.yml --- roles/calibre/defaults/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index 6a068d101..effe32dc4 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -19,10 +19,11 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" -calibre_deb_url: http://download.iiab.io/packages/ -#calibre_3.30.0+dfsg-1_all -#calibre-bin_3.30.0+dfsg-1_armhf -calibre_deb_version: 3.30.0 +calibre_deb_url: http://download.iiab.io/packages +# Must contain both packages for the pinned version, formatted as follows: +# calibre_3.30.0+dfsg-1_all (25M, 2018-08-24) +# calibre-bin_3.30.0+dfsg-1_armhf (742K, 2018-08-30) +calibre_deb_pin_version: 3.30.0 # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X: (now handled by calibre_via_debs in /opt/iiab/iiab/vars/*) #calibre_debs_on_debian: True From 9ca970041be5f0bef4a075ec6c45854f70cf7e8e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:04:35 -0400 Subject: [PATCH 32/72] Update debs.yml --- roles/calibre/tasks/debs.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index ed55c4c7a..612404a2a 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -33,7 +33,7 @@ # command: scripts/calibre-install-latest.sh # REQUIRED for Calibre 3.29 on 2018-08-21 (PR #1015), as all above strategies failed (only script that was not attempted: Sid-like calibre-install-unstable.sh). CLARIF: RESULTING microSD's ARE NOT BOOTABLE IN Zero W (#952) # when: is_rpi and internet_available -- name: Download PINNED version {{ calibre_deb_version }} of calibre & calibre-bin (rpi) +- name: Download PINNED version {{ calibre_deb_pin_version }} of calibre & calibre-bin (rpi) get_url: url: "{{ calibre_deb_url }}/{{ item }}" dest: "{{ downloads_dir }}/{{ item }}" @@ -42,11 +42,11 @@ #backup: no timeout: "{{ download_timeout }}" with_items: - - calibre_{{ calibre_deb_version }}+dfsg-1_all.deb - - calibre-bin_{{ calibre_deb_version }}+dfsg-1_armhf.deb + - calibre_{{ calibre_deb_pin_version }}+dfsg-1_all.deb + - calibre-bin_{{ calibre_deb_pin_version }}+dfsg-1_armhf.deb when: is_rpi and internet_available -- name: Install/Upgrade both, to PINNED version {{ calibre_deb_version }} while using additional .deb's from testing (rpi) +- name: Install/Upgrade both, to PINNED version {{ calibre_deb_pin_version }} while using additional .deb's from testing (rpi) command: scripts/calibre-install-pinned-rpi.sh # RECOMMENDED for Calibre 3.30 on 2018-08-30, so IIAB microSD will be bootable in RPi Zero W when: is_rpi and internet_available From 00a1309a23affd5acdad6cfb86ff8c4c3244ff08 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:44:10 -0400 Subject: [PATCH 33/72] Update default_vars.yml --- vars/default_vars.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index e2d00699c..b5a9919a9 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -348,10 +348,6 @@ osm_enabled: False # iiab_install: True # iiab_enabled: False -# Pathagar - similar to Calibre, but unmaintained -pathagar_install: False -pathagar_enabled: False - # Sugarizer # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 @@ -429,7 +425,11 @@ vnstat_enabled: False # ================================================================ -# Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) +# Pathagar - similar to Calibre and Calibre-Web, but unmaintained +# pathagar_install: False +# pathagar_enabled: False + +# TeamViewer - unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From f9e1610b197c428a67cc790540dc91d117e2e1b2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:50:55 -0400 Subject: [PATCH 34/72] Update local_vars_min.yml --- vars/local_vars_min.yml | 65 +++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 2ba4bdbc0..2b74abc50 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -131,33 +131,9 @@ iiab_usb_lib_show_all: True # ejabberd_xs_install: False # ejabberd_xs_enabled: False + # 6-GENERIC-APPS -# Calibre E-Book Library -# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL -# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. - -calibre_install: False -calibre_enabled: False -# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) -# calibre_via_debs: True -calibre_unstable_debs: False -# Try python x86_64 upgrade of Calibre (like vars/.yml already do) -# calibre_via_python: True -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr -calibre_port: 8080 -# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ -calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 -# In addition to: http://box/books box/libros box/livres box/livros box/liv - -# Calibre-Web alternative to Calibre, offers a clean/modern UX -calibreweb_install: False -calibreweb_enabled: False -calibreweb_port: 8083 -# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? -calibreweb_url: /books -calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - dokuwiki_install: False dokuwiki_enabled: False @@ -176,6 +152,7 @@ nextcloud_enabled: False wordpress_install: False wordpress_enabled: False + # 7-EDU-APPS # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS @@ -198,15 +175,12 @@ moodle_enabled: False osm_install: False osm_enabled: False -# Similar to Calibre, but unmaintained -pathagar_install: False -pathagar_enabled: False - # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: False sugarizer_enabled: False + # 8-MGMT-TOOLS # BitTorrent downloader for large Content Packs etc @@ -247,6 +221,39 @@ phpmyadmin_enabled: False vnstat_install: True vnstat_enabled: True + +# 9-LOCAL-ADDONS + +# Calibre E-Book Library +# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL +# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. + +calibre_install: False +calibre_enabled: False +# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) +# calibre_via_debs: True +calibre_unstable_debs: False +# Try python x86_64 upgrade of Calibre (like vars/.yml already do) +# calibre_via_python: True +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +calibre_port: 8080 +# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ +calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 +# In addition to: http://box/books box/libros box/livres box/livros box/liv + +# Calibre-Web alternative to Calibre, offers a clean/modern UX +calibreweb_install: False +calibreweb_enabled: False +calibreweb_port: 8083 +# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? +calibreweb_url: /books +calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web + + +# Unmaintained (consider Calibre or Calibre-Web above?) +# pathagar_install: False +# pathagar_enabled: False + # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From f971d9697bf8d51f1f0d03dfeb55081337952e7c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:54:44 -0400 Subject: [PATCH 35/72] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 89 +++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index db8d3e62f..d896071ca 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -131,33 +131,9 @@ iiab_usb_lib_show_all: True # ejabberd_xs_install: False # ejabberd_xs_enabled: False + # 6-GENERIC-APPS -# Calibre E-Book Library -# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL -# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. - -calibre_install: True -calibre_enabled: True -# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) -# calibre_via_debs: True -calibre_unstable_debs: False -# Try python x86_64 upgrade of Calibre (like vars/.yml already do) -# calibre_via_python: True -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr -calibre_port: 8080 -# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ -calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 -# In addition to: http://box/books box/libros box/livres box/livros box/liv - -# Calibre-Web alternative to Calibre, offers a clean/modern UX -calibreweb_install: True -calibreweb_enabled: True -calibreweb_port: 8083 -# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? -calibreweb_url: /books -calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - dokuwiki_install: False dokuwiki_enabled: False @@ -176,6 +152,7 @@ nextcloud_enabled: True wordpress_install: True wordpress_enabled: True + # 7-EDU-APPS # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS @@ -207,12 +184,55 @@ pathagar_enabled: False sugarizer_install: True sugarizer_enabled: True + # 8-MGMT-TOOLS +awstats_install: True +awstats_enabled: True + +monit_install: False +monit_enabled: False + +munin_install: True +munin_enabled: True + +# Handy for maintaining tables, but DANGEROUS if not locked down +phpmyadmin_install: False +phpmyadmin_enabled: False + +vnstat_install: True +vnstat_enabled: True + + +# 9-LOCAL-ADDONS + +# Calibre E-Book Library +# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL +# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. +calibre_install: False +calibre_enabled: False +# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) +# calibre_via_debs: True +calibre_unstable_debs: False +# Try python x86_64 upgrade of Calibre (like vars/.yml already do) +# calibre_via_python: True +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +calibre_port: 8080 +# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ +calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 +# In addition to: http://box/books box/libros box/livres box/livros box/liv + +# Calibre-Web alternative to Calibre, offers a clean/modern UX +calibreweb_install: False +calibreweb_enabled: False +calibreweb_port: 8083 +# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? +calibreweb_url: /books +calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web + # BitTorrent downloader for large Content Packs etc transmission_install: False transmission_enabled: False - # A. Uncomment language(s) to download KA Lite videos to /library/transmission # using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/ transmission_kalite_languages: @@ -231,21 +251,10 @@ transmission_kalite_languages: # then click "Scan content folder for videos" (can take many minutes!) # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO -awstats_install: True -awstats_enabled: True -monit_install: False -monit_enabled: False - -munin_install: True -munin_enabled: True - -# Handy for maintaining tables, but DANGEROUS if not locked down -phpmyadmin_install: False -phpmyadmin_enabled: False - -vnstat_install: True -vnstat_enabled: True +# Unmaintained (consider Calibre or Calibre-Web above?) +# pathagar_install: False +# pathagar_enabled: False # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False From 6ba00907074ed3118290158a95093d2bc2ab6d77 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:55:34 -0400 Subject: [PATCH 36/72] Update local_vars_min.yml --- vars/local_vars_min.yml | 44 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 2b74abc50..3705218a6 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -183,28 +183,6 @@ sugarizer_enabled: False # 8-MGMT-TOOLS -# BitTorrent downloader for large Content Packs etc -transmission_install: False -transmission_enabled: False - -# A. Uncomment language(s) to download KA Lite videos to /library/transmission -# using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/ -transmission_kalite_languages: - - english - #- french - #- hindi - #- portugal-portuguese - #- brazilian-portuguese - #- spanish - #- swahili -# B. Monitor BitTorrent downloads at http://box:9091 using Admin/changeme -# until the download is confirmed complete (can take hours or days!) -# C. Carefully move all videos/thumbnails into /library/ka-lite/content -# (DO NOT OVERWRITE SUBFOLDERS assessment, locale, srt !) -# D. Log in to KA Lite at http://box:8008/updates/videos/ using Admin/changeme -# then click "Scan content folder for videos" (can take many minutes!) -# E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO - awstats_install: True awstats_enabled: True @@ -227,7 +205,6 @@ vnstat_enabled: True # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. - calibre_install: False calibre_enabled: False # Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) @@ -249,6 +226,27 @@ calibreweb_port: 8083 calibreweb_url: /books calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web +# BitTorrent downloader for large Content Packs etc +transmission_install: False +transmission_enabled: False +# A. Uncomment language(s) to download KA Lite videos to /library/transmission +# using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/ +transmission_kalite_languages: + - english + #- french + #- hindi + #- portugal-portuguese + #- brazilian-portuguese + #- spanish + #- swahili +# B. Monitor BitTorrent downloads at http://box:9091 using Admin/changeme +# until the download is confirmed complete (can take hours or days!) +# C. Carefully move all videos/thumbnails into /library/ka-lite/content +# (DO NOT OVERWRITE SUBFOLDERS assessment, locale, srt !) +# D. Log in to KA Lite at http://box:8008/updates/videos/ using Admin/changeme +# then click "Scan content folder for videos" (can take many minutes!) +# E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO + # Unmaintained (consider Calibre or Calibre-Web above?) # pathagar_install: False From 2769a0f091be84b5b31c9e701d5afc875371af00 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:58:25 -0400 Subject: [PATCH 37/72] Update local_vars_big.yml --- vars/local_vars_big.yml | 87 ++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index cc755ef22..44f63635e 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -131,33 +131,9 @@ iiab_usb_lib_show_all: True # ejabberd_xs_install: False # ejabberd_xs_enabled: False + # 6-GENERIC-APPS -# Calibre E-Book Library -# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL -# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. - -calibre_install: True -calibre_enabled: True -# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) -# calibre_via_debs: True -calibre_unstable_debs: False -# Try python x86_64 upgrade of Calibre (like vars/.yml already do) -# calibre_via_python: True -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr -calibre_port: 8080 -# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ -calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 -# In addition to: http://box/books box/libros box/livres box/livros box/liv - -# Calibre-Web alternative to Calibre, offers a clean/modern UX -calibreweb_install: True -calibreweb_enabled: True -calibreweb_port: 8083 -# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? -calibreweb_url: /books -calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - dokuwiki_install: True dokuwiki_enabled: True @@ -176,6 +152,7 @@ nextcloud_enabled: True wordpress_install: True wordpress_enabled: True + # 7-EDU-APPS # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS @@ -207,12 +184,55 @@ pathagar_enabled: False sugarizer_install: True sugarizer_enabled: True + # 8-MGMT-TOOLS +awstats_install: True +awstats_enabled: True + +monit_install: True +monit_enabled: True + +munin_install: True +munin_enabled: True + +# Handy for maintaining tables, but DANGEROUS if not locked down +phpmyadmin_install: True +phpmyadmin_enabled: False + +vnstat_install: True +vnstat_enabled: True + + +# 9-LOCAL-ADDONS + +# Calibre E-Book Library +# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL +# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. +calibre_install: True +calibre_enabled: True +# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) +# calibre_via_debs: True +calibre_unstable_debs: False +# Try python x86_64 upgrade of Calibre (like vars/.yml already do) +# calibre_via_python: True +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +calibre_port: 8080 +# Change calibre to XYZ to add your own mnemonic URL like: http://box/XYZ +calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 +# In addition to: http://box/books box/libros box/livres box/livros box/liv + +# Calibre-Web alternative to Calibre, offers a clean/modern UX +calibreweb_install: True +calibreweb_enabled: True +calibreweb_port: 8083 +# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? +calibreweb_url: /books +calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web + # BitTorrent downloader for large Content Packs etc transmission_install: False transmission_enabled: False - # A. Uncomment language(s) to download KA Lite videos to /library/transmission # using http://pantry.learningequality.org/downloads/ka-lite/0.17/content/ transmission_kalite_languages: @@ -231,21 +251,6 @@ transmission_kalite_languages: # then click "Scan content folder for videos" (can take many minutes!) # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO -awstats_install: True -awstats_enabled: True - -monit_install: True -monit_enabled: True - -munin_install: True -munin_enabled: True - -# Handy for maintaining tables, but DANGEROUS if not locked down -phpmyadmin_install: True -phpmyadmin_enabled: False - -vnstat_install: True -vnstat_enabled: True # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False From 1c49ef015dd54ce60aec80a37a15cd8bfafc8a3f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 16:58:53 -0400 Subject: [PATCH 38/72] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index d896071ca..c78022195 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -209,8 +209,8 @@ vnstat_enabled: True # Calibre E-Book Library # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. -calibre_install: False -calibre_enabled: False +calibre_install: True +calibre_enabled: True # Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) # calibre_via_debs: True calibre_unstable_debs: False @@ -223,8 +223,8 @@ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 # In addition to: http://box/books box/libros box/livres box/livros box/liv # Calibre-Web alternative to Calibre, offers a clean/modern UX -calibreweb_install: False -calibreweb_enabled: False +calibreweb_install: True +calibreweb_enabled: True calibreweb_port: 8083 # http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? calibreweb_url: /books From 5d91da6ba4516cf413c527879ec6a6ee5725116e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:01:00 -0400 Subject: [PATCH 39/72] Update local_vars_big.yml --- vars/local_vars_big.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 44f63635e..db8ca1a35 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -69,6 +69,7 @@ dansguardian_enabled: True # wondershaper_install: False # wondershaper_enabled: False + # 1-PREP # 2-COMMON @@ -80,6 +81,7 @@ allow_apache_sudo: True # roles/mysql runs here (mandatory) + # 4-SERVER-OPTIONS # SECURITY WARNING: See http://wiki.laptop.org/go/IIAB/Security @@ -113,6 +115,7 @@ samba_enabled: False # Show entire contents of USB sticks/drives (at http://box/usb) iiab_usb_lib_show_all: True + # 5-XO-SERVICES # Lesser-supported XO services need additional testing. Please contact From c54bb173256b281f8d8517474a8e7dbdef4c1683 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:01:27 -0400 Subject: [PATCH 40/72] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index c78022195..48f52c284 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -69,6 +69,7 @@ dansguardian_enabled: False # wondershaper_install: False # wondershaper_enabled: False + # 1-PREP # 2-COMMON @@ -80,6 +81,7 @@ allow_apache_sudo: True # roles/mysql runs here (mandatory) + # 4-SERVER-OPTIONS # SECURITY WARNING: See http://wiki.laptop.org/go/IIAB/Security @@ -113,6 +115,7 @@ samba_enabled: False # Show entire contents of USB sticks/drives (at http://box/usb) iiab_usb_lib_show_all: True + # 5-XO-SERVICES # Lesser-supported XO services need additional testing. Please contact From f1a48238b12e100923186bc8d3b2bdbfe31b63bf Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:02:02 -0400 Subject: [PATCH 41/72] Update local_vars_min.yml --- vars/local_vars_min.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 3705218a6..5994decbd 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -69,6 +69,7 @@ dansguardian_enabled: False # wondershaper_install: False # wondershaper_enabled: False + # 1-PREP # 2-COMMON @@ -80,6 +81,7 @@ allow_apache_sudo: True # roles/mysql runs here (mandatory) + # 4-SERVER-OPTIONS # SECURITY WARNING: See http://wiki.laptop.org/go/IIAB/Security @@ -113,6 +115,7 @@ samba_enabled: False # Show entire contents of USB sticks/drives (at http://box/usb) iiab_usb_lib_show_all: True + # 5-XO-SERVICES # Lesser-supported XO services need additional testing. Please contact From cf4888d08c2747e6f7e0edfa6c87cc57b01de222 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:03:44 -0400 Subject: [PATCH 42/72] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 48f52c284..e574295b3 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -178,10 +178,6 @@ moodle_enabled: False osm_install: True osm_enabled: True -# Similar to Calibre, but unmaintained -pathagar_install: False -pathagar_enabled: False - # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: True From e5d12e94a7cce9df98b9839ae3735876fc62415c Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:04:55 -0400 Subject: [PATCH 43/72] Update local_vars_big.yml --- vars/local_vars_big.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index db8ca1a35..da4dd89ba 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -178,10 +178,6 @@ moodle_enabled: True osm_install: True osm_enabled: True -# Similar to Calibre, but unmaintained -pathagar_install: False -pathagar_enabled: False - # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 sugarizer_install: True @@ -255,6 +251,10 @@ transmission_kalite_languages: # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO +# Unmaintained (consider Calibre or Calibre-Web above?) +# pathagar_install: False +# pathagar_enabled: False + # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False From c7dc051b75a317770bff0ef305fa69ee37677416 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:15:43 -0400 Subject: [PATCH 44/72] Update default_vars.yml --- vars/default_vars.yml | 133 ++++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 63 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index b5a9919a9..8de24ad5e 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -153,16 +153,9 @@ wan_nameserver: # Our past convention was to install everything in all aggregates # And to enable everything in 1-PREP, 2-COMMON, and 3-BASE-SERVER + # 1-PREP -# Docker (lesser-supported) -docker_install: False -docker_enabled: False - -# SchoolTool - unmaintained -schooltool_install: False -schooltool_enabled: False - # 2-COMMON # 3-BASE-SERVER @@ -180,6 +173,7 @@ mysql_enabled: True # mysql_root_password: $6$iiab51$3ICIW0CLWxxMW2a3yrHZ38ukZItD5tcadL4rWcE9D.qIGStxhh8rRsaSxoj3b.MYxI/VRDNjpzSYK/V6zkWFI0 mysql_root_password: fixmysql + # 4-SERVER-OPTIONS # sshd @@ -237,6 +231,7 @@ iiab_usb_lib_show_all: False # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info) nodocs: False + # 5-XO-SERVICES # Lesser-supported XO services need additional testing. Please contact @@ -257,32 +252,9 @@ ejabberd_xs_enabled: False idmgr_install: False idmgr_enables: False + # 6-GENERIC-APPS -# Calibre E-Book Library -# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL -# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. - -calibre_install: True -calibre_enabled: True -# vars/raspbian-9.yml tries the .deb upgrade of Calibre, overriding this default: -calibre_via_debs: False -calibre_unstable_debs: False -# vars/.yml use Calibre's python installer/upgrader (x86_64), overriding this default: -calibre_via_python: False -# Change calibre_port to 8010 if you're using XO laptops needing above idmgr -calibre_port: 8080 -# Change calibre to XYZ add your own mnemonic URL like: http://box/XYZ -calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 - -# Calibre-Web alternative to Calibre, offers a clean/modern UX -calibreweb_install: True -calibreweb_enabled: True -calibreweb_port: 8083 -# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? -calibreweb_url: /books -calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web - # DokuWiki dokuwiki_install: False dokuwiki_enabled: False @@ -305,14 +277,11 @@ ejabberd_enabled: False nextcloud_install: True nextcloud_enabled: False -# ownCloud -owncloud_install: False -owncloud_enabled: False - # WordPress wordpress_install: True wordpress_enabled: False + # 7-EDU-APPS # KA Lite - SEE THE "Transmission" BITTORRENT DOWNLOADER FURTHER BELOW, TO INSTALL THOUSANDS OF VIDEOS @@ -355,8 +324,62 @@ sugarizer_install: True sugarizer_enabled: False sugarizer_port: 8089 + # 8-MGMT-TOOLS +# AWStats - summarizes http access logs +awstats_install: True +awstats_enabled: False + +# Monit +monit_install: False +monit_enabled: False +watchdog: + - sshd + - idmgr + - ejabberd + - httpd + - postgresql + - squid + +# Munin +munin_install: True +munin_enabled: False + +# Handy for maintaining tables, but DANGEROUS if not locked down +phpmyadmin_install: False +phpmyadmin_enabled: False + +# vnStat +vnstat_install: True +vnstat_enabled: False + + +# 9-LOCAL-ADDONS + +# Calibre E-Book Library +# WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL +# ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED. +calibre_install: True +calibre_enabled: True +# vars/raspbian-9.yml tries the .deb upgrade of Calibre, overriding this default: +calibre_via_debs: False +calibre_unstable_debs: False +# vars/.yml use Calibre's python installer/upgrader (x86_64), overriding this default: +calibre_via_python: False +# Change calibre_port to 8010 if you're using XO laptops needing above idmgr +calibre_port: 8080 +# Change calibre to XYZ add your own mnemonic URL like: http://box/XYZ +calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 + +# Calibre-Web alternative to Calibre, offers a clean/modern UX +calibreweb_install: True +calibreweb_enabled: True +calibreweb_port: 8083 +# http://box/books works. Add {box/libros, box/livres, box/livros, box/liv} etc? +calibreweb_url: /books +calibreweb_home: "{{ content_base }}/calibre-web" # /library/calibre-web + # Transmission is a BitTorrent downloader for large Content Packs etc transmission_install: False transmission_enabled: False @@ -396,36 +419,16 @@ transmission_kalite_languages: transmission_username: Admin transmission_password: changeme -# AWStats - summarizes http access logs -awstats_install: True -awstats_enabled: False -# Monit -monit_install: False -monit_enabled: False -watchdog: - - sshd - - idmgr - - ejabberd - - httpd - - postgresql - - squid +# Docker - unmaintained +# docker_install: False +# docker_enabled: False -# Munin -munin_install: True -munin_enabled: False +# SchoolTool - unmaintained +# schooltool_install: False +# schooltool_enabled: False -# Handy for maintaining tables, but DANGEROUS if not locked down -phpmyadmin_install: False -phpmyadmin_enabled: False - -# vnStat -vnstat_install: True -vnstat_enabled: False - -# ================================================================ - -# Pathagar - similar to Calibre and Calibre-Web, but unmaintained +# Pathagar - unmaintained (consider Calibre or Calibre-Web above?) # pathagar_install: False # pathagar_enabled: False @@ -433,6 +436,10 @@ vnstat_enabled: False # teamviewer_install: False # teamviewer_enabled: False +# ownCloud - unmaintained +# owncloud_install: False +# owncloud_enabled: False + # sugar-stats - unmaintained # sugar_stats_install: False # sugar_stats_enabled: False From 4f585acf6ac8e143d2f0f948954cfa72eed71259 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:17:25 -0400 Subject: [PATCH 45/72] Update default_vars.yml --- vars/default_vars.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 8de24ad5e..f566a48f3 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -428,6 +428,10 @@ transmission_password: changeme # schooltool_install: False # schooltool_enabled: False +# Debian SchoolTool - nmaintained +# debian_schooltool_install: False +# debian_schooltool_enabled: False + # Pathagar - unmaintained (consider Calibre or Calibre-Web above?) # pathagar_install: False # pathagar_enabled: False From 34ec04f2e87124f5b239ac9e0173fe0da06a9326 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:18:34 -0400 Subject: [PATCH 46/72] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index f566a48f3..5988bb209 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -428,7 +428,7 @@ transmission_password: changeme # schooltool_install: False # schooltool_enabled: False -# Debian SchoolTool - nmaintained +# Debian SchoolTool - nnmaintained # debian_schooltool_install: False # debian_schooltool_enabled: False From 76a30ab5026128defb06c39c37d1714b2dfbfb94 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:21:39 -0400 Subject: [PATCH 47/72] Update local_vars_min.yml --- vars/local_vars_min.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 5994decbd..6c19e7125 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -251,21 +251,13 @@ transmission_kalite_languages: # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO -# Unmaintained (consider Calibre or Calibre-Web above?) -# pathagar_install: False -# pathagar_enabled: False - # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False # Unmaintained -# sugar_stats_install: False -# sugar_stats_enabled: False - -# Unmaintained -# xovis_install: False -# xovis_enabled: False +# docker_install: False +# docker_enabled: False # Unmaintained # schooltool_install: False @@ -274,3 +266,15 @@ transmission_kalite_languages: # Unmaintained # debian_schooltool_install: False # debian_schooltool_enabled: False + +# Unmaintained (consider Calibre or Calibre-Web above?) +# pathagar_install: False +# pathagar_enabled: False + +# Unmaintained +# sugar_stats_install: False +# sugar_stats_enabled: False + +# Unmaintained +# xovis_install: False +# xovis_enabled: False From 1d254cf70f7850ae81b26117a32e38a16bf8a8a6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:23:17 -0400 Subject: [PATCH 48/72] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index e574295b3..6f2f5f6bf 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -251,21 +251,13 @@ transmission_kalite_languages: # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO -# Unmaintained (consider Calibre or Calibre-Web above?) -# pathagar_install: False -# pathagar_enabled: False - # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False # Unmaintained -# sugar_stats_install: False -# sugar_stats_enabled: False - -# Unmaintained -# xovis_install: False -# xovis_enabled: False +# docker_install: False +# docker_enabled: False # Unmaintained # schooltool_install: False @@ -274,3 +266,15 @@ transmission_kalite_languages: # Unmaintained # debian_schooltool_install: False # debian_schooltool_enabled: False + +# Unmaintained (consider Calibre or Calibre-Web above?) +# pathagar_install: False +# pathagar_enabled: False + +# Unmaintained +# sugar_stats_install: False +# sugar_stats_enabled: False + +# Unmaintained +# xovis_install: False +# xovis_enabled: False From e47389f670012d4f9d9e39b60a2ad664592a57e6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:24:25 -0400 Subject: [PATCH 49/72] Update local_vars_big.yml --- vars/local_vars_big.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index da4dd89ba..142cdf298 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -251,21 +251,13 @@ transmission_kalite_languages: # E. READ "KA Lite Administration: What tips & tricks exist?" AT http://FAQ.IIAB.IO -# Unmaintained (consider Calibre or Calibre-Web above?) -# pathagar_install: False -# pathagar_enabled: False - # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) # teamviewer_install: False # teamviewer_enabled: False # Unmaintained -# sugar_stats_install: False -# sugar_stats_enabled: False - -# Unmaintained -# xovis_install: False -# xovis_enabled: False +# docker_install: False +# docker_enabled: False # Unmaintained # schooltool_install: False @@ -274,3 +266,15 @@ transmission_kalite_languages: # Unmaintained # debian_schooltool_install: False # debian_schooltool_enabled: False + +# Unmaintained (consider Calibre or Calibre-Web above?) +# pathagar_install: False +# pathagar_enabled: False + +# Unmaintained +# sugar_stats_install: False +# sugar_stats_enabled: False + +# Unmaintained +# xovis_install: False +# xovis_enabled: False From 5ef627eecd2ab4da172e453342eaba7bed296a4d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:29:47 -0400 Subject: [PATCH 50/72] Update main.yml --- roles/0-init/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 014f21393..46d7c4de3 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -116,11 +116,11 @@ postgresql_enabled: True when: moodle_enabled or pathagar_enabled -- name: Turn on vars for Docker if SchoolTool is to be installed - set_fact: - docker_install: True - docker_enabled: True - when: schooltool_enabled or schooltool_install +#- name: Turn on vars for Docker if SchoolTool is to be installed +# set_fact: +# docker_install: True +# docker_enabled: True +# when: schooltool_enabled or schooltool_install - name: Set python_path (redhat) set_fact: From e5614f44c61ef803f01cb728d17f6f3e91bac592 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:32:11 -0400 Subject: [PATCH 51/72] Update main.yml --- roles/6-generic-apps/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/6-generic-apps/tasks/main.yml b/roles/6-generic-apps/tasks/main.yml index 38f707041..40a432e5d 100644 --- a/roles/6-generic-apps/tasks/main.yml +++ b/roles/6-generic-apps/tasks/main.yml @@ -33,11 +33,11 @@ when: nextcloud_install tags: nextcloud -- name: OWNCLOUD - include_role: - name: owncloud - when: owncloud_install - tags: owncloud +#- name: OWNCLOUD +# include_role: +# name: owncloud +# when: owncloud_install +# tags: owncloud - name: WORDPRESS include_role: From b97c21fd84144d44fd57bd51fa722d20c3cb29e2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:33:05 -0400 Subject: [PATCH 52/72] Update main.yml --- roles/7-edu-apps/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 941f6347e..f36742ec3 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -36,7 +36,7 @@ - name: PATHAGAR include_role: name: pathagar - when: pathagar_install + when: pathagar_install is defined and pathagar_install tags: pathagar - name: SUGARIZER From 4f2dfac544ed11b6b34416fd539e2fa60b695a67 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:33:27 -0400 Subject: [PATCH 53/72] Update main.yml --- roles/8-mgmt-tools/tasks/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/roles/8-mgmt-tools/tasks/main.yml b/roles/8-mgmt-tools/tasks/main.yml index b94404814..c29b86169 100644 --- a/roles/8-mgmt-tools/tasks/main.yml +++ b/roles/8-mgmt-tools/tasks/main.yml @@ -3,12 +3,6 @@ - name: ...IS BEGINNING ====================================== command: echo -- name: TRANSMISSION - include_role: - name: transmission - when: transmission_install - tags: transmission - - name: AWSTATS include_role: name: awstats From c78216a8f6ef1563f2a6ceea4b1b2d5ea1729e00 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 17:34:04 -0400 Subject: [PATCH 54/72] Update main.yml --- roles/9-local-addons/tasks/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index ba8d7d74b..0479c4734 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/roles/9-local-addons/tasks/main.yml @@ -2,7 +2,7 @@ - name: ...IS BEGINNING ==================================== command: echo - + - name: CALIBRE include_role: name: calibre @@ -15,6 +15,12 @@ when: calibreweb_install tags: calibre-web +- name: TRANSMISSION + include_role: + name: transmission + when: transmission_install + tags: transmission + - name: Recording STAGE 9 HAS COMPLETED ==================== lineinfile: dest: /etc/iiab/iiab.env From 1f641a79085b408ecd92b12149bc277971b50360 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 19:03:39 -0400 Subject: [PATCH 55/72] Update default_vars.yml --- vars/default_vars.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 5988bb209..1756516c9 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -420,6 +420,10 @@ transmission_username: Admin transmission_password: changeme +# TeamViewer - unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) +# teamviewer_install: False +# teamviewer_enabled: False + # Docker - unmaintained # docker_install: False # docker_enabled: False @@ -436,14 +440,6 @@ transmission_password: changeme # pathagar_install: False # pathagar_enabled: False -# TeamViewer - unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io) -# teamviewer_install: False -# teamviewer_enabled: False - -# ownCloud - unmaintained -# owncloud_install: False -# owncloud_enabled: False - # sugar-stats - unmaintained # sugar_stats_install: False # sugar_stats_enabled: False @@ -461,6 +457,10 @@ transmission_password: changeme # xovis_backup_dir: "/library/users" # xovis_chart_heading: "My School: Usage Data Visualization" +# ownCloud - unmaintained +# owncloud_install: False +# owncloud_enabled: False + # Ajenti - unmaintained # ajenti_install: False # ajenti_enabled: False @@ -490,3 +490,9 @@ is_rpi: False is_redhat: False is_fedora: False is_centos: False + +# How This Works: +# 1. /opt/iiab/iiab/iiab-install copies scripts/local_facts.fact to /etc/ansible/facts.d/local_facts.fact +# 2. Ansible runs /etc/ansible/facts.d/local_facts.fact to identify the OS +# 3. ./iiab-install (iiab-stages.yml) or ./runrole (run-one-role.yml) or Admin Console (iiab-from-console.yml) invoke the correct /opt/iiab/iiab/vars/.yml +# Longer Explanation: https://github.com/iiab/iiab/wiki/IIAB-Variables (Order of Execution and Precedence) From 4170bee005e5d27df8fbaca70b4463aed565f6b4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 20:44:32 -0400 Subject: [PATCH 56/72] Update README.rst --- roles/kalite/README.rst | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index 49aa9d972..f9afea950 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -2,48 +2,46 @@ KA Lite README ============== -This role installs KA Lite, an offline version of the Khan Academy (https://www.khanacademy.org/), -written by Learning Equality (https://learningequality.org/ka-lite/). +This role installs KA Lite, an offline version of the Khan Academy (https://www.khanacademy.org), written by Learning Equality +(https://learningequality.org/ka-lite/). -KA Lite has two servers, a light httpd server that serves Khan Academy videos, and a cron server -that sets up cron jobs to download language packs and KA videos from the internet. There are -separate flags to enable these two servers. +KA Lite has two servers, a light httpd server that serves Khan Academy videos, and a cron server that sets up cron jobs to download language packs and KA videos from the internet. There are separate flags to enable these two servers. Access ------ -If enabled and with the default settings KA Lite should be accessible at http://schoolserver:8008/ +If enabled and with the default settings KA Lite should be accessible at http://box:8008 or http://box.lan:8008 -To login to kalite enter +To log in to KA Lite:: -User Name: Admin -Password: changme + Username: Admin + Password: changme Bulk Loading Videos ------------------- -Videos and their corresponding png images can be copied into /library/ka-lite/content and will -be recognized the next time kalite is started. The kalite website has instructions on getting -videos with bitsync. These videos are also smaller than the ones downloaded with the kalite -admin interface. +Videos and their corresponding png images can be copied into /library/ka-lite/content and will be recognized the next time kalite is started. Please see http://FAQ.IIAB.IO ("KA Lite Administration: What tips & tricks exist?") to use BitTorrent to download compressed KA Lite videos, that are much smaller than the ones downloaded with KA Lite's administrative interface. + +As of August 2018, please also consider the `"Transmission" BitTorrent tool `_ that will automatically download thousands of KA Lite videos for you, if install and enable it and set the language(s) you want within /etc/iiab/local_vars.yml Configuration Parameters ------------------------ -Please look in defaults/main.yml for the default values of the various install parameters. Everything -in this readme assumes the default values. +Look at `role/kalite/defaults/main.yml `_ for the default values of the various install parameters. -Trouble Shooting ----------------- +Troubleshooting +--------------- -Starting with kalite 0.15 you can run the server manually with the following commands: +Starting with KA Lite 0.15 (October 2015) you can run the server manually with the following commands: * systemctl stop kalite-serve (make sure the systemd service is not running) * export KALITE_HOME=/library/ka-lite (point kalite to the right environment) -* kalite start (start the server; can take more than 10 minutes in some environment) +* kalite start (start the server; can take more than 10 minutes in some environments) To return to using the systemd unit: * export KALITE_HOME=/library/ka-lite (point kalite to the right environment) * kalite stop * systemctl start kalite-serve + +*In late 2017, Internet-in-a-Box added a virtual environment (/usr/local/kalite/venv/) to keep KA Lite's Python and PHP package risks under control. As such the command* `/usr/bin/kalite `_ *is a wrapper to this virtualenv.* From a8b26507bdf56d18e1477c977c12d27d692f2979 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:02:24 -0400 Subject: [PATCH 57/72] Update main.yml --- roles/kalite/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml index 6f8908d86..4afdd9d9e 100644 --- a/roles/kalite/tasks/main.yml +++ b/roles/kalite/tasks/main.yml @@ -2,12 +2,12 @@ # Assume all XOs are F18 and nothing else is -- name: Calc KA Lite db file name (Fedora 18) +- name: Set KA Lite's SQLite filename (Fedora 18) set_fact: kalite_db_name: "{{ kalite_root }}/kalite/database/data.sqlite" when: is_F18 -- name: Calc KA Lite db file name (OS's other than Fedora 18) +- name: Set KA Lite's SQLite filename (OS's other than Fedora 18) set_fact: kalite_db_name: "{{ kalite_root }}/database/data.sqlite" when: not is_F18 @@ -46,7 +46,7 @@ - option: name value: "KA Lite" - option: description - value: '"KA Lite is a server to present Khan Academy videos offline and to download them."' + value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if you want to track your own progress."' - option: path value: "{{ kalite_root }}" - option: port From a4dc78fad8b4bf2b4d9d5dad5acdddba56ef4a4e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:05:09 -0400 Subject: [PATCH 58/72] Update main.yml --- roles/kalite/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml index 4afdd9d9e..8554967ac 100644 --- a/roles/kalite/tasks/main.yml +++ b/roles/kalite/tasks/main.yml @@ -46,7 +46,7 @@ - option: name value: "KA Lite" - option: description - value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if you want to track your own progress."' + value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students wanting to track their own progress."' - option: path value: "{{ kalite_root }}" - option: port From 92693f678fcfa754bb9194bc8141642a42f70871 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:09:03 -0400 Subject: [PATCH 59/72] Update README.rst --- roles/kalite/README.rst | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index f9afea950..01be5676b 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -5,17 +5,19 @@ KA Lite README This role installs KA Lite, an offline version of the Khan Academy (https://www.khanacademy.org), written by Learning Equality (https://learningequality.org/ka-lite/). -KA Lite has two servers, a light httpd server that serves Khan Academy videos, and a cron server that sets up cron jobs to download language packs and KA videos from the internet. There are separate flags to enable these two servers. +KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students wanting to track their own progress. -Access ------- +[Originally KA Lite had two servers, a light httpd server that serves Khan Academy videos, and a cron server that sets up cron jobs to download language packs and KA videos from the internet. There were separate flags to enable these two servers.] + +Using It +-------- If enabled and with the default settings KA Lite should be accessible at http://box:8008 or http://box.lan:8008 -To log in to KA Lite:: +Log in to KA Lite:: Username: Admin - Password: changme + Password: changeme Bulk Loading Videos ------------------- From 4056b5cd2d80546a485937f1e68f08799ed57b3b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:11:31 -0400 Subject: [PATCH 60/72] Update README.rst --- roles/kalite/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index 01be5676b..b9d9571db 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -2,7 +2,7 @@ KA Lite README ============== -This role installs KA Lite, an offline version of the Khan Academy (https://www.khanacademy.org), written by Learning Equality +This role installs KA Lite, an offline version of the Khan Academy (https://www.khanacademy.org) created by Learning Equality (https://learningequality.org/ka-lite/). KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students wanting to track their own progress. From 9abba5d58ace6d0dba13c572c0b2eb02c29aa59a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:18:40 -0400 Subject: [PATCH 61/72] Update README.rst --- roles/kalite/README.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index b9d9571db..a516ef030 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -12,7 +12,7 @@ KA Lite downloads Khan Academy videos for offline use, with exercises and accoun Using It -------- -If enabled and with the default settings KA Lite should be accessible at http://box:8008 or http://box.lan:8008 +If enabled with the default settings, KA Lite should be accessible at http://box:8008 or http://box.lan:8008 Log in to KA Lite:: @@ -22,9 +22,11 @@ Log in to KA Lite:: Bulk Loading Videos ------------------- -Videos and their corresponding png images can be copied into /library/ka-lite/content and will be recognized the next time kalite is started. Please see http://FAQ.IIAB.IO ("KA Lite Administration: What tips & tricks exist?") to use BitTorrent to download compressed KA Lite videos, that are much smaller than the ones downloaded with KA Lite's administrative interface. +Videos and their corresponding PNG thumbnail images can be copied into /library/ka-lite/content and will be recognized the next time KA Lite is started. -As of August 2018, please also consider the `"Transmission" BitTorrent tool `_ that will automatically download thousands of KA Lite videos for you, if install and enable it and set the language(s) you want within /etc/iiab/local_vars.yml +Please see http://FAQ.IIAB.IO ("KA Lite Administration: What tips & tricks exist?") to use BitTorrent to download compressed KA Lite videos, that are much smaller than the ones downloaded via KA Lite's administrative interface. + +As of August 2018, please also consider the `"Transmission" BitTorrent tool `_ that will automatically download thousands of KA Lite videos to your Internet-in-a-Box (IIAB) — if you install and enable "transmission" within /etc/iiab/local_vars.yml — carefully choosing the language(s) you want as downloading these videos can take many hours if not days! Configuration Parameters ------------------------ From a02f3a16b0919ab7b679dce268ca0638e07592c5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:25:43 -0400 Subject: [PATCH 62/72] Update main.yml --- roles/calibre-web/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/calibre-web/tasks/main.yml b/roles/calibre-web/tasks/main.yml index 7856e7e8e..34f2b2b60 100644 --- a/roles/calibre-web/tasks/main.yml +++ b/roles/calibre-web/tasks/main.yml @@ -86,7 +86,8 @@ state: restarted when: calibreweb_enabled -- name: Enable http://box/calibre-web with Apache +# Default: http://box/books +- name: Enable http://box{{ calibreweb_url }} with Apache command: a2ensite calibre-web.conf when: calibreweb_enabled From b8da259041347dff58a76a827119e58401102159 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:34:32 -0400 Subject: [PATCH 63/72] Update README.rst --- roles/kalite/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index a516ef030..ac4e39354 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -2,10 +2,10 @@ KA Lite README ============== -This role installs KA Lite, an offline version of the Khan Academy (https://www.khanacademy.org) created by Learning Equality +This role installs KA Lite, an offline version of Khan Academy (https://www.khanacademy.org) created by Learning Equality (https://learningequality.org/ka-lite/). -KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students wanting to track their own progress. +KA Lite downloads Khan Academy videos to your Internet-in-a-Box for offline use, with exercises and accounts if students want to track their own progress. [Originally KA Lite had two servers, a light httpd server that serves Khan Academy videos, and a cron server that sets up cron jobs to download language packs and KA videos from the internet. There were separate flags to enable these two servers.] From c8684d841d0bd7e48d312b8a09997e8ebe8e719f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:35:26 -0400 Subject: [PATCH 64/72] Update main.yml --- roles/kalite/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml index 8554967ac..07c965d68 100644 --- a/roles/kalite/tasks/main.yml +++ b/roles/kalite/tasks/main.yml @@ -46,7 +46,7 @@ - option: name value: "KA Lite" - option: description - value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students wanting to track their own progress."' + value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students want to track their own progress."' - option: path value: "{{ kalite_root }}" - option: port From 095ad771fb83f9d7b71b978f4fa3b5a771573a63 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:40:13 -0400 Subject: [PATCH 65/72] Update README.rst --- roles/kalite/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index ac4e39354..49fc944c7 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -14,7 +14,7 @@ Using It If enabled with the default settings, KA Lite should be accessible at http://box:8008 or http://box.lan:8008 -Log in to KA Lite:: +After your Internet-in-a-Box (IIAB) is completely installed, log in to KA Lite to explore and configure it:: Username: Admin Password: changeme From 5a18fed15715fb891ec401999d61b1e1bf07d388 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:41:34 -0400 Subject: [PATCH 66/72] Update README.rst --- roles/kalite/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index 49fc944c7..58c38e428 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -19,8 +19,8 @@ After your Internet-in-a-Box (IIAB) is completely installed, log in to KA Lite t Username: Admin Password: changeme -Bulk Loading Videos -------------------- +Bulk Downloading Videos +----------------------- Videos and their corresponding PNG thumbnail images can be copied into /library/ka-lite/content and will be recognized the next time KA Lite is started. From c6742d0e24bf8a92af7f888a2fc6c01aa541ba1d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:48:28 -0400 Subject: [PATCH 67/72] Update README.rst --- roles/kalite/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index 58c38e428..beb06f08b 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -48,4 +48,4 @@ To return to using the systemd unit: * kalite stop * systemctl start kalite-serve -*In late 2017, Internet-in-a-Box added a virtual environment (/usr/local/kalite/venv/) to keep KA Lite's Python and PHP package risks under control. As such the command* `/usr/bin/kalite `_ *is a wrapper to this virtualenv.* +*In late 2017, Internet-in-a-Box added a virtual environment (/usr/local/kalite/venv/) to keep KA Lite's Python package/dependency risks under control. As such the command* `/usr/bin/kalite `_ *is a wrapper to this virtualenv.* From 762bb4eb0edf48dfe4fa38fd9f2f92078dd2e06d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:49:27 -0400 Subject: [PATCH 68/72] Update README.rst --- roles/kalite/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index beb06f08b..fc16dd439 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -14,7 +14,7 @@ Using It If enabled with the default settings, KA Lite should be accessible at http://box:8008 or http://box.lan:8008 -After your Internet-in-a-Box (IIAB) is completely installed, log in to KA Lite to explore and configure it:: +After your Internet-in-a-Box (IIAB) is completely installed, log in to KA Lite to explore and configure:: Username: Admin Password: changeme From a4d218249438d23998990d5d77ac24fb173d0346 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 21:58:18 -0400 Subject: [PATCH 69/72] Update README.rst --- roles/transmission/README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/transmission/README.rst b/roles/transmission/README.rst index 5f751a667..36cb95b19 100644 --- a/roles/transmission/README.rst +++ b/roles/transmission/README.rst @@ -17,7 +17,7 @@ Caveat emptor! (That's Latin for "Buyer Beware") Using It -------- -Install Transmission by setting 'transmission_install' and 'transmission_enabled' to True in /etc/iiab/local_vars.yml and then running:: +Install Transmission by setting 'transmission_install' and 'transmission_enabled' to True in `/etc/iiab/local_vars.yml `_ — carefully choosing language(s) for KA Lite videos you want to download — and then run:: cd /opt/iiab/iiab ./runrole transmission @@ -59,7 +59,7 @@ Adding Torrents Transmission can facilitate provisioning content onto your IIAB, e.g. by adding thousands of KA Lite videos from places like: http://pantry.learningequality.org/downloads/ka-lite/0.17/content/ -Please read the lettered instructions (A, B, C, D) in /etc/iiab/local_vars.yml and 'KA Lite Administration: What tips & tricks exist?' at http://FAQ.IIAB.IO outlining how to use Transmission to download and then install KA Lite content. +Please read the lettered instructions (A, B, C, D) in `/etc/iiab/local_vars.yml `_ and 'KA Lite Administration: What tips & tricks exist?' at http://FAQ.IIAB.IO outlining how to use Transmission to download and then install KA Lite content. You can also download other torrents using Transmission's web interface, or by typing 'transmission-remote' at the command-line:: @@ -68,7 +68,7 @@ You can also download other torrents using Transmission's web interface, or by t Known Issues ------------ -* Default Transmission user/group may need fixing (https://github.com/transmission/transmission/issues/537). You can set Ansible variables 'transmission_user' and 'transmission_group' e.g. in /opt/iiab/iiab/roles/transmission/defaults/main.yml (you might need 'User=' and 'Group=' in systemd unit file /lib/systemd/system/transmission-daemon.service — both might need to be set to 'debian-transmission' — if so 'systemctl daemon-reload' then 'systemctl restart transmission-daemon'). +* Default Transmission user/group may need fixing (https://github.com/transmission/transmission/issues/537) in some circumstances. You can set Ansible variables 'transmission_user' and 'transmission_group' e.g. in /opt/iiab/iiab/roles/transmission/defaults/main.yml (you might need 'User=' and 'Group=' in systemd unit file /lib/systemd/system/transmission-daemon.service — e.g. both might need to be set to 'debian-transmission' — if so then run 'systemctl daemon-reload' and 'systemctl restart transmission-daemon'). * Random Ports: Currently it is not possible to use random ports in the range 49152-65535. It is difficult to open multiple ports in IIAB's iptables-based firewall. From 42fd905388373cd3deb60966c5fd6b4bafb4ecdb Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 23:10:22 -0400 Subject: [PATCH 70/72] 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 641c86193..4770a77d9 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -1,4 +1,4 @@ RewriteEngine on RewriteRule ^{{ kiwix_alias_url }}$ {{ kiwix_url }} [R] -ProxyPass {{ kiwix_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} +ProxyPass {{ kiwix_alias_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} From 36e80169d3181e679d3b45ce388fbec91bb9334e Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 31 Aug 2018 00:23:54 -0400 Subject: [PATCH 71/72] URLs box/kiwix & box/kiwix/zim both now work! --- roles/kiwix/templates/kiwix.conf.j2 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index 4770a77d9..d34140f19 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -1,4 +1,10 @@ -RewriteEngine on -RewriteRule ^{{ kiwix_alias_url }}$ {{ kiwix_url }} [R] +# 2018-08-31: FAILS to enable http://box/kiwix +#RewriteEngine on +#RewriteRule ^{{ kiwix_alias_url }}$ {{ kiwix_url }} [R] -ProxyPass {{ kiwix_alias_url }} http://127.0.0.1:{{ kiwix_port}}{{ kiwix_url }} +# 2018-08-31: SUCCEEDS in enabling http://box/kiwix +RedirectMatch ^{{ kiwix_alias_url }}$ {{ 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 }} From 1143d031f6c33e26728c57b0f62ee9c334dc99b6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 31 Aug 2018 00:32:38 -0400 Subject: [PATCH 72/72] Update kiwix.conf.j2 --- roles/kiwix/templates/kiwix.conf.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/kiwix/templates/kiwix.conf.j2 b/roles/kiwix/templates/kiwix.conf.j2 index d34140f19..3132ba2e8 100644 --- a/roles/kiwix/templates/kiwix.conf.j2 +++ b/roles/kiwix/templates/kiwix.conf.j2 @@ -5,6 +5,7 @@ # 2018-08-31: SUCCEEDS in enabling http://box/kiwix RedirectMatch ^{{ kiwix_alias_url }}$ {{ kiwix_url }} +# 2018-08-31: SUCCEEDS in enabling http://box/kiwix/ & http://box/kiwix/zim & http://box/kiwix/zim/ #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 }}