From bbe0e48114aeed4f515564c902ac4685fa994493 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 12 Sep 2018 14:05:53 -0400 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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