From 7ab1c262366d88b5aaa5c23d4418806f1ddc6596 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 6 Sep 2018 23:35:04 -0400 Subject: [PATCH 01/22] Calibre 3.30 -> 3.31 (awaiting .deb's) --- roles/calibre/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index bdf88373f..ea148226f 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,9 +21,9 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se 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+dfsg-1 +# calibre_3.31.0+dfsg-1_all (25M, 2018-08-24) +# calibre-bin_3.31.0+dfsg-1_armhf (742K, 2018-08-30) +calibre_deb_pin_version: 3.31.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 From 7ed579ce80a7b7ed47a678111afac384eb2360b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 10:52:32 -0400 Subject: [PATCH 02/22] Update main.yml --- roles/calibre/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index ea148226f..a807fbfd1 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,8 +21,8 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: -# calibre_3.31.0+dfsg-1_all (25M, 2018-08-24) -# calibre-bin_3.31.0+dfsg-1_armhf (742K, 2018-08-30) +# calibre_3.31.0+dfsg-1_all (25M, 2018-09-07) +# calibre-bin_3.31.0+dfsg-1_armhf (747K, 2018-09-12) calibre_deb_pin_version: 3.31.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/*) From 6a28055a842f3402851bcbd9a959969a087ecd60 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 10:56:17 -0400 Subject: [PATCH 03/22] Update calibre-install-pinned-rpi.sh --- scripts/calibre-install-pinned-rpi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-pinned-rpi.sh b/scripts/calibre-install-pinned-rpi.sh index c0dc408a5..d27c8b0a9 100755 --- a/scripts/calibre-install-pinned-rpi.sh +++ b/scripts/calibre-install-pinned-rpi.sh @@ -10,7 +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..." +# WARNING: you MUST remove old .deb's from /opt/iiab/downloads if upgrading Calibre in this way, SEE: http://FAQ.IIAB.IO "Can I upgrade or reinstall server apps?" 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 d3f5e34f1fe1e3794a76c4f8c600914d1ff9adfb Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 11:01:52 -0400 Subject: [PATCH 04/22] Update main.yml --- roles/calibre/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre/defaults/main.yml b/roles/calibre/defaults/main.yml index a807fbfd1..ac64a8165 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -21,8 +21,8 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se calibre_deb_url: http://download.iiab.io/packages # Must contain both packages for the pinned version, formatted as follows: -# calibre_3.31.0+dfsg-1_all (25M, 2018-09-07) -# calibre-bin_3.31.0+dfsg-1_armhf (747K, 2018-09-12) +# calibre_3.31.0+dfsg-1_all.deb (25M, 2018-09-07) +# calibre-bin_3.31.0+dfsg-1_armhf.deb (747K, 2018-09-12) calibre_deb_pin_version: 3.31.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/*) From 2278f9507b284463189b8029db41b876126a2c42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 12:32:40 -0400 Subject: [PATCH 05/22] Update README.rst --- roles/calibre-web/README.rst | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index b2527156a..f734c4ec8 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -1,3 +1,11 @@ +.. |ss| raw:: html + + + +.. |se| raw:: html + + + ================== Calibre-Web README ================== @@ -92,15 +100,17 @@ manually:: Known Issues ------------ -* Trying to access an empty public bookshelf causes a system error. +* |ss| Trying to access an empty public bookshelf causes a system error. |se| Appears fixed as of 2018-09-12: `janeczku/calibre-web#620 `_ -* As of August 2018, it's sometimes impossible to set the language of an - e-book: `#1040 `_, `janeczku/calibre-web#593 `_ +* |ss| As of August 2018, it's sometimes impossible to set the language of an + e-book: `#1040 `_, `janeczku/calibre-web#593 `_ |se| Appears fixed as of 2018-09-12: `janeczku/calibre-web#620 `_ -* As of August 2018, calibre-web doesn't yet include Calibre's e-book +* |ss| 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, HTML, TXT etc — to permit reading on a - wider array client devices and client software). + wider array client devices and client software). |se| This new calibre-web + feature (which requires Calibre's ebook-converter program) is not yet quite + working in IIAB as of 2018-09-12: `janeczku/calibre-web#624 `_ * 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 From 40efb291a563b4c81cfe222650342b5b1850ce96 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 12:41:58 -0400 Subject: [PATCH 06/22] Update README.rst --- roles/calibre-web/README.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index f734c4ec8..7cc72630c 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -6,6 +6,9 @@ +.. |nbsp| unicode:: 0xA0 + :trim: + ================== Calibre-Web README ================== @@ -100,15 +103,15 @@ manually:: Known Issues ------------ -* |ss| Trying to access an empty public bookshelf causes a system error. |se| Appears fixed as of 2018-09-12: `janeczku/calibre-web#620 `_ +* |ss| Trying to access an empty public bookshelf causes a system error. |se| |nbsp| Appears fixed as of 2018-09-12: `janeczku/calibre-web#620 `_ * |ss| As of August 2018, it's sometimes impossible to set the language of an - e-book: `#1040 `_, `janeczku/calibre-web#593 `_ |se| Appears fixed as of 2018-09-12: `janeczku/calibre-web#620 `_ + e-book: `#1040 `_, `janeczku/calibre-web#593 `_ |se| |nbsp| Appears fixed as of 2018-09-12: `janeczku/calibre-web#620 `_ * |ss| 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, HTML, TXT etc — to permit reading on a - wider array client devices and client software). |se| This new calibre-web + wider array client devices and client software). |se| |nbsp| This new calibre-web feature (which requires Calibre's ebook-converter program) is not yet quite working in IIAB as of 2018-09-12: `janeczku/calibre-web#624 `_ From f930e388acf211211257363d32f1add2e5cd0124 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 13:17:03 -0400 Subject: [PATCH 07/22] Update README.rst --- roles/calibre-web/README.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 7cc72630c..3aa89a172 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -112,8 +112,13 @@ Known Issues conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows teachers to convert between PDF, EPUB, HTML, TXT etc — to permit reading on a wider array client devices and client software). |se| |nbsp| This new calibre-web - feature (which requires Calibre's ebook-converter program) is not yet quite - working in IIAB as of 2018-09-12: `janeczku/calibre-web#624 `_ + feature (which requires Calibre's ebook-converter program) needs to be manually configured in IIAB as of 2018-09-12: `janeczku/calibre-web#624 `_ + + Specifically, to enable e-book conversion, log in as Admin/changeme (etc) then click http://box/books -> Admin -> Basic Configuration -> External binaries, then change these 2 settings: + + * Change radio button "No converter" to "Use calibre's ebook converter" + * In textfield "Path to convertertool" type in: ``/usr/bin/ebook-convert`` + * Submit * 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 From 6eab8cc3f485b6d1ba718d8d53f74192086ab059 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 13:21:54 -0400 Subject: [PATCH 08/22] 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 3aa89a172..040a9c688 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -119,6 +119,8 @@ Known Issues * Change radio button "No converter" to "Use calibre's ebook converter" * In textfield "Path to convertertool" type in: ``/usr/bin/ebook-convert`` * Submit + * Verify that ebook-convert appears on calibre-web's "About" page at http://box/books/stats + * Test it by clicking any book -> Edit metadata -> Convert book format: * 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 From d4c27c376145b397403e703b8ab3a1b186eeea73 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 13:23:19 -0400 Subject: [PATCH 09/22] 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 040a9c688..98958961c 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -119,8 +119,8 @@ Known Issues * Change radio button "No converter" to "Use calibre's ebook converter" * In textfield "Path to convertertool" type in: ``/usr/bin/ebook-convert`` * Submit - * Verify that ebook-convert appears on calibre-web's "About" page at http://box/books/stats - * Test it by clicking any book -> Edit metadata -> Convert book format: + * Verify that "ebook-convert" appears on calibre-web's "About" page at http://box/books/stats + * Test it by clicking any e-book -> Edit metadata -> Convert book format: * 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 From de68219d3e14a2650faa1ccf334602e6ff03c996 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 13:27:12 -0400 Subject: [PATCH 10/22] Update README.rst --- roles/calibre-web/README.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 98958961c..57932e1cb 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -112,9 +112,12 @@ Known Issues conversion functionality (e.g. Calibre 3.27.1 [released 2018-07-06] allows teachers to convert between PDF, EPUB, HTML, TXT etc — to permit reading on a wider array client devices and client software). |se| |nbsp| This new calibre-web - feature (which requires Calibre's ebook-converter program) needs to be manually configured in IIAB as of 2018-09-12: `janeczku/calibre-web#624 `_ + feature (which requires Calibre's ebook-converter program) needs to be manually + configured in IIAB 6.6 as of 2018-09-12: `janeczku/calibre-web#624 `_ - Specifically, to enable e-book conversion, log in as Admin/changeme (etc) then click http://box/books -> Admin -> Basic Configuration -> External binaries, then change these 2 settings: + Specifically, to enable e-book conversion, log in as Admin/changeme (etc) then + click http://box/books -> Admin -> Basic Configuration -> External binaries, then + change these 2 settings: * Change radio button "No converter" to "Use calibre's ebook converter" * In textfield "Path to convertertool" type in: ``/usr/bin/ebook-convert`` From ec25b765f871399bfb53163c756809e72fbccfe8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 13:56:06 -0400 Subject: [PATCH 11/22] Update README.rst --- roles/calibre-web/README.rst | 40 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 57932e1cb..c38508f74 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -19,14 +19,18 @@ 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 (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). +as a possible alternative to Calibre. *WARNING: Calibre-Web depends on +Calibre's own /usr/bin/ebook-convert program, so we strongly recommend you +install Calibre too during your IIAB installation!* + +Please note Calibre-Web's Ansible playbook is ``/opt/iiab/iiab/roles/calibre-web`` +whereas that its Ansible variables ``calibreweb_*`` do **not** include the dash, +per Ansible recommendations. Using It -------- -After installation, try out calibre-web at http://box/books (or box.lan/books). +After installation, try out Calibre-Web at http://box/books (or box.lan/books). Typically students access it without a password (to read and download books) whereas teachers add books using an administrative account, as follows:: @@ -34,7 +38,7 @@ whereas teachers add books using an administrative account, as follows:: Username: Admin Password: changeme -If the default configuration is not found, the calibre-web server creates a +If the default configuration is not found, the Calibre-Web server creates a new settings file with calibre-web's own default administrative account:: Username: admin @@ -43,7 +47,7 @@ new settings file with calibre-web's own default administrative account:: Backend ------- -You can manage the backend calibre-web server with these systemd commands:: +You can manage the backend Calibre-Web server with these systemd commands:: systemctl enable calibre-web systemctl restart calibre-web @@ -53,7 +57,7 @@ You can manage the backend calibre-web server with these systemd commands:: Configuration ------------- -To configure calibre-web, log in 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:: @@ -72,18 +76,18 @@ Back Up Everything ------------------ Please back up the entire folder ``/library/calibre-web`` before upgrading — -as it contains your calibre-web content **and** settings! +as it contains your Calibre-Web content **and** settings! Upgrading --------- -Reinstalling calibre-web automatically upgrades to the latest version if your +Reinstalling Calibre-Web automatically upgrades to the latest version if your 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 calibre-web +sure you want to (re)install bare/minimal metadata, and force all Calibre-Web settings to the default. Then run**:: cd /opt/iiab/iiab @@ -94,7 +98,7 @@ Or, to reinstall all of IIAB:: cd /opt/iiab/iiab ./iiab-install --reinstall -Or, if you just want to upgrade calibre-web code alone, prior to proceeding +Or, if you just want to upgrade Calibre-Web code alone, prior to proceeding manually:: cd /opt/iiab/calibre-web @@ -108,29 +112,29 @@ Known Issues * |ss| As of August 2018, it's sometimes impossible to set the language of an e-book: `#1040 `_, `janeczku/calibre-web#593 `_ |se| |nbsp| Appears fixed as of 2018-09-12: `janeczku/calibre-web#620 `_ -* |ss| As of August 2018, calibre-web doesn't yet include Calibre's e-book +* |ss| 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, HTML, TXT etc — to permit reading on a - wider array client devices and client software). |se| |nbsp| This new calibre-web - feature (which requires Calibre's ebook-converter program) needs to be manually + wider array client devices and client software). |se| |nbsp| This new Calibre-Web + feature (which depends on Calibre's ebook-converter program) needs to be manually configured in IIAB 6.6 as of 2018-09-12: `janeczku/calibre-web#624 `_ Specifically, to enable e-book conversion, log in as Admin/changeme (etc) then - click http://box/books -> Admin -> Basic Configuration -> External binaries, then + click http://box/books -> Admin -> Basic Configuration -> External binaries. Then change these 2 settings: * Change radio button "No converter" to "Use calibre's ebook converter" * In textfield "Path to convertertool" type in: ``/usr/bin/ebook-convert`` * Submit - * Verify that "ebook-convert" appears on calibre-web's "About" page at http://box/books/stats - * Test it by clicking any e-book -> Edit metadata -> Convert book format: + * Verify that "ebook-convert" appears on Calibre-Web's "About" page at http://box/books/stats + * Test it by clicking any e-book -> Edit metadata -> Convert book format * 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 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 +* Calibre-Web does not currently use version numbers, so glitches might occasionally arise, when upstream developers change its master branch without warning. From 9bcfd078fbec14163b5add528ff2f3f38f009aac Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 13:59:24 -0400 Subject: [PATCH 12/22] Update README.rst --- roles/calibre-web/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index c38508f74..1f31874ef 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -24,7 +24,7 @@ Calibre's own /usr/bin/ebook-convert program, so we strongly recommend you install Calibre too during your IIAB installation!* Please note Calibre-Web's Ansible playbook is ``/opt/iiab/iiab/roles/calibre-web`` -whereas that its Ansible variables ``calibreweb_*`` do **not** include the dash, +whereas its Ansible variables ``calibreweb_*`` do **not** include the dash, per Ansible recommendations. Using It From bbe0e48114aeed4f515564c902ac4685fa994493 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:05:53 -0400 Subject: [PATCH 13/22] Update default_vars.yml --- vars/default_vars.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index ba13fdb15..38f9dde6f 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -411,7 +411,10 @@ 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 +# WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert +# program, so we recommend you install Calibre (above) too! + +# Calibre-Web alternative to Calibre, offers a clean/modern UX. calibreweb_install: True calibreweb_enabled: True calibreweb_port: 8083 From 2545a73546fa2859f17a80c1ae67fe52b1e0ae89 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:05:59 -0400 Subject: [PATCH 14/22] 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 b94d5e0eb..3102c2457 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -242,6 +242,9 @@ calibre_port: 8080 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 +# WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert +# program, so we recommend you install Calibre (above) too! + # Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: False calibreweb_enabled: False From 90d1fe003e0b01559c99520ba6476cf9e4c442dd Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:06:04 -0400 Subject: [PATCH 15/22] 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 9d220a81e..1cb06dbd1 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -242,6 +242,9 @@ calibre_port: 8080 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 +# WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert +# program, so we recommend you install Calibre (above) too! + # Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: True calibreweb_enabled: True From 49b9d79c642c5a7985494fe8919124b4d7ea8120 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:06:08 -0400 Subject: [PATCH 16/22] 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 be4b30e08..1d5e42136 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -242,6 +242,9 @@ calibre_port: 8080 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 +# WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert +# program, so we recommend you install Calibre (above) too! + # Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: True calibreweb_enabled: True From 4638e019f070e1924a128d28e0e0e8662fb99ecb Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:08:00 -0400 Subject: [PATCH 17/22] 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 38f9dde6f..3cd861869 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -414,7 +414,7 @@ calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert # program, so we recommend you install Calibre (above) too! -# Calibre-Web alternative to Calibre, offers a clean/modern UX. +# Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: True calibreweb_enabled: True calibreweb_port: 8083 From 94e0fbba4292b532aed1129ef91437ceb8f42918 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:12:22 -0400 Subject: [PATCH 18/22] Update README.rst --- roles/calibre-web/README.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/roles/calibre-web/README.rst b/roles/calibre-web/README.rst index 1f31874ef..2531d146b 100644 --- a/roles/calibre-web/README.rst +++ b/roles/calibre-web/README.rst @@ -19,9 +19,11 @@ 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 (IIAB) -as a possible alternative to Calibre. *WARNING: Calibre-Web depends on -Calibre's own /usr/bin/ebook-convert program, so we strongly recommend you -install Calibre too during your IIAB installation!* +as a possible alternative to Calibre. + +*WARNING: Calibre-Web depends on Calibre's own /usr/bin/ebook-convert program, +so we strongly recommend you also install Calibre during your IIAB +installation!* Please note Calibre-Web's Ansible playbook is ``/opt/iiab/iiab/roles/calibre-web`` whereas its Ansible variables ``calibreweb_*`` do **not** include the dash, From 7d8354a0dc475be876e880ed2cef67ec1fcfa362 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:13:52 -0400 Subject: [PATCH 19/22] 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 3cd861869..23a00db1c 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -412,7 +412,7 @@ calibre_port: 8080 calibre_web_path: calibre #NEEDS WORK: https://github.com/iiab/iiab/issues/529 # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert -# program, so we recommend you install Calibre (above) too! +# program, so we recommend you also install Calibre (above!) # Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: True From 3528e4c5fb5433d0f6d27d35333237013a638159 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:14:13 -0400 Subject: [PATCH 20/22] Update local_vars_big.yml --- vars/local_vars_big.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 1d5e42136..a5465d733 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -243,7 +243,7 @@ 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 # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert -# program, so we recommend you install Calibre (above) too! +# program, so we recommend you also install Calibre (above!) # Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: True From aabab49f1f10884f183b38fc8838be710f1d2793 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:14:42 -0400 Subject: [PATCH 21/22] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 1cb06dbd1..ff035e97f 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -243,7 +243,7 @@ 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 # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert -# program, so we recommend you install Calibre (above) too! +# program, so we recommend you also install Calibre (above!) # Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: True From dc8090cfa6f6816efff8b1e4f10580ba464e43f6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:15:14 -0400 Subject: [PATCH 22/22] Update local_vars_min.yml --- vars/local_vars_min.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 3102c2457..1c6a0294a 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -243,7 +243,7 @@ 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 # WARNING: Calibre-Web (below) depends on Calibre's own /usr/bin/ebook-convert -# program, so we recommend you install Calibre (above) too! +# program, so we recommend you also install Calibre (above!) # Calibre-Web alternative to Calibre, offers a clean/modern UX calibreweb_install: False