From b24a065e6e8eb1fc5d29a56711ddfea72f05f23b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 15:55:14 -0400 Subject: [PATCH 01/51] Update main.yml --- 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 8cafdb995..d00d6aada 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -13,6 +13,6 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" # USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X -calibre_debs_on_debian: True -# enable calibre unstable -calibre_unstable: False +#calibre_debs_on_debian: True +# Enable calibre unstable: (moved to vars/default_vars.yml) +#calibre_unstable_debs: False From 4e94a0d6a796b89bd3e76fa836480374b8804da0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:13:58 -0400 Subject: [PATCH 02/51] Update main.yml --- roles/calibre/tasks/main.yml | 42 +++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/roles/calibre/tasks/main.yml b/roles/calibre/tasks/main.yml index c09aa03ba..74c10c428 100644 --- a/roles/calibre/tasks/main.yml +++ b/roles/calibre/tasks/main.yml @@ -1,18 +1,36 @@ -# 1. INSTALL THE LATEST CALIBRE 3.X+ (calibre-server etc) ON ALL OS'S +# 1. INSTALL THE LATEST CALIBRE 3.X+ (calibre, calibredb, calibre-server etc) ON ALL OS'S -# RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST -- name: Install Calibre via calibre-installer.py (redhat, ubuntu, debian if NOT calibre_debs_on_debian) - include_tasks: py-installer.yml - when: is_redhat or is_ubuntu or (is_debian and not calibre_debs_on_debian) - #when: not is_rpi +- name: Check if /usr/bin/calibre exists + stat: + path: "/usr/bin/calibre" + register: calib_executable -- name: Install Calibre via .debs (Raspbian, Debian if calibre_debs_on_debian) +- name: Install Calibre via OS's package installer (IF /usr/bin/calibre MISSING) + package: + name: "{{ item }}" + state: latest + with_items: + - calibre + - calibre-bin + when: internet_available and (not calib_executable.stat.exists) + +- name: Install Calibre experimental .debs IF calibre_via_debs (AND /usr/bin/calibre WAS MISSING) include_tasks: debs.yml - when: is_rpi or (is_debian and calibre_debs_on_debian) + when: calibre_via_debs and (not calib_executable.stat.exists) -#- name: Install Calibre via .debs (Ubuntu 18.xx) -# include_tasks: debs.yml -# when: is_ubuntu_18 +- name: Install Calibre via calibre-installer.py IF calibre_via_python (AND /usr/bin/calibre WAS MISSING) + include_tasks: py-installer.yml + when: calibre_via_python and (not calib_executable.stat.exists) + +# SEE calibre_via_python's value vars/default_vars.yml, vars/ubuntu-18.yml & +# vars/raspbian-9.yml: try to AVOID Python installer on Raspbian since its +# .deb's (http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/) +# are updated within about 10 days of Calibre's quasi-monthly releases! +# +# BUT IF ABSOLUTELY NEC: (SEE roles/calibre/tasks/debs.yml) +# - run testing branch for RPi: scripts/calibre-install-latest-rpi.sh +# - run testing branch for Ubuntu 16.04: scripts/calibre-install-latest.sh +# - run unstable branch for Debian etc: scripts/calibre-install-unstable.sh - name: Create calibre-serve.service and calibre.conf template: @@ -27,7 +45,7 @@ - { src: 'calibre-serve.service.j2', dest: '/etc/systemd/system/calibre-serve.service', mode: '0644'} - { src: 'calibre.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'} -- name: Forcing systemd to reread configs +- name: Force systemd to reread configs systemd: daemon_reload: yes when: calibre_config.changed From 26c6d2ea7468c00114d1399b3b59849ffaf02885 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:21:49 -0400 Subject: [PATCH 03/51] Update py-installer.yml --- roles/calibre/tasks/py-installer.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/roles/calibre/tasks/py-installer.yml b/roles/calibre/tasks/py-installer.yml index 96c3162e5..65c13fba1 100644 --- a/roles/calibre/tasks/py-installer.yml +++ b/roles/calibre/tasks/py-installer.yml @@ -32,21 +32,23 @@ path: "{{ downloads_dir }}/calibre-installer.py" register: calib_inst -- name: Check if calibre-uninstall exists in /usr/bin - stat: - path: "/usr/bin/calibre-uninstall" - register: calib_uninst +# MOVED UP TO roles/calibre/tasks/main.yml (now checks for /usr/bin/calibre) +#- name: Check if calibre-uninstall exists in /usr/bin +# stat: +# path: "/usr/bin/calibre-uninstall" +# register: calib_uninst - name: FAIL (force Ansible to exit) IF /opt/iiab/downloads/calibre-installer.py doesn't exist OR needed Internet connection is missing # meta: end_play fail: msg: "{{ downloads_dir }}/calibre-installer.py and an Internet connection are REQUIRED in order to install Calibre!" - when: (not calib_inst.stat.exists) or (not internet_available and not calib_uninst.stat.exists) + when: (not calib_inst.stat.exists) or (not internet_available) + #when: (not calib_inst.stat.exists) or (not internet_available and not calib_uninst.stat.exists) -# INSTALL THE LATEST CALIBRE (calibre-server etc) - RUNS IF /usr/bin/calibre-uninstall DOES NOT ALEADY EXIST +# INSTALL THE LATEST CALIBRE (calibre, calibredb, calibre-server etc) -- name: Run calibre-installer.py to install Calibre programs into /usr/bin - MANUALLY REMOVE /usr/bin/calibre-uninstall TO FORCE calibre-installer.py TO REINSTALL/UPGRADE HERE! +- name: Run calibre-installer.py to install Calibre programs into /usr/bin shell: "{{ downloads_dir }}/calibre-installer.py >> /dev/null" - args: - creates: /usr/bin/calibre-uninstall + #args: + # creates: /usr/bin/calibre-uninstall when: internet_available From 859c0d53c5a5996a45142c701d6ea97a022ef075 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:31:18 -0400 Subject: [PATCH 04/51] Update py-installer.yml --- roles/calibre/tasks/py-installer.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/calibre/tasks/py-installer.yml b/roles/calibre/tasks/py-installer.yml index 65c13fba1..bee575f4d 100644 --- a/roles/calibre/tasks/py-installer.yml +++ b/roles/calibre/tasks/py-installer.yml @@ -1,5 +1,7 @@ +# roles/calibre/tasks/main.yml requires calibre_via_debs (to be True) before calling this script. + # Seems to work with just about any Linux (Fedora 18 on OLPC XO Laptops??) and deals with dependencies. -# But is arch dependent: requires x86_64 or i686 for now. +# BUT IS ARCH DEPENDENT: requires x86_64 or i686 as of early 2018. - name: Download latest linux-installer.py from GitHub to calibre-installer.py get_url: @@ -38,7 +40,7 @@ # path: "/usr/bin/calibre-uninstall" # register: calib_uninst -- name: FAIL (force Ansible to exit) IF /opt/iiab/downloads/calibre-installer.py doesn't exist OR needed Internet connection is missing +- name: FAIL (force Ansible to exit) IF /opt/iiab/downloads/calibre-installer.py OR Internet ARE MISSING # meta: end_play fail: msg: "{{ downloads_dir }}/calibre-installer.py and an Internet connection are REQUIRED in order to install Calibre!" From 85c7bef787457fd80a370a86c5688f86cdbe12d8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:32:44 -0400 Subject: [PATCH 05/51] Update py-installer.yml --- roles/calibre/tasks/py-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/calibre/tasks/py-installer.yml b/roles/calibre/tasks/py-installer.yml index bee575f4d..29f9b3265 100644 --- a/roles/calibre/tasks/py-installer.yml +++ b/roles/calibre/tasks/py-installer.yml @@ -1,4 +1,4 @@ -# roles/calibre/tasks/main.yml requires calibre_via_debs (to be True) before calling this script. +# roles/calibre/tasks/main.yml requires calibre_via_python (to be True) before calling this script. # Seems to work with just about any Linux (Fedora 18 on OLPC XO Laptops??) and deals with dependencies. # BUT IS ARCH DEPENDENT: requires x86_64 or i686 as of early 2018. From 61aba8cca222e346e05fd8c2921f2f05f01cc533 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:33:59 -0400 Subject: [PATCH 06/51] Update debs.yml --- roles/calibre/tasks/debs.yml | 37 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index ad9917fce..12f86f797 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -1,24 +1,31 @@ -- name: Start by installing OS's Calibre package - package: - name: "{{ item }}" - state: latest - with_items: - - calibre - - calibre-bin - when: internet_available +# roles/calibre/tasks/main.yml requires calibre_via_debs (to be True) before calling this script. -# April 5 2018 raspbian is now tracking the latest Calibre with a small delay. -# Should you really want the latest just run the below script standalone, it is -# strongly suggested that waiting for the lastest deb from Raspbian is the best. +# MOVED UP TO roles/calibre/tasks/main.yml +#- name: Start by installing OS's Calibre package +# package: +# name: "{{ item }}" +# state: latest +# with_items: +# - calibre +# - calibre-bin +# when: internet_available -- name: Upgrade to testing Calibre - RPi +# April/May 2018: Raspbian .deb's for the latest Calibre now appear +# (http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/) +# within about 10 days of Calibre's quasi-monthly releases +# (https://calibre-ebook.com/whats-new). + +# If you want the latest Calibre, run the appropriate below script standalone. +# HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!) + +- name: Upgrade to Calibre testing .deb's - target Raspbian (rpi) command: scripts/calibre-install-latest-rpi.sh when: is_rpi and internet_available -- name: Upgrade to testing Calibre - non-RPi +- name: 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 unstable Calibre - all +- name: Upgrade to Calibre unstable .deb's IF calibre_unstable_debs command: scripts/calibre-install-unstable.sh - when: calibre_unstable and internet_available + when: calibre_unstable_debs and internet_available From c6fecc7b896b4f8f17de4aae2ebb1e599e3c3a19 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:37:28 -0400 Subject: [PATCH 07/51] Update raspbian-9.yml --- vars/raspbian-9.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index bab3f83e0..6567daba9 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -21,3 +21,7 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.6 systemd_location: /lib/systemd/system +# Under Consideration: (to avoid ~10 day delay after each Calibre release) +#calibre_via_debs: True +# roles/calibre/tasks/py-installer.yml likely to fail on ARM as of early 2018: +#calibre_via_python: True From 876e68af36e4b0d77df8a9bde14ebe8ced4c7b6d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:40:31 -0400 Subject: [PATCH 08/51] Update ubuntu-18.yml --- vars/ubuntu-18.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/ubuntu-18.yml b/vars/ubuntu-18.yml index c05df9cf8..17068759e 100644 --- a/vars/ubuntu-18.yml +++ b/vars/ubuntu-18.yml @@ -21,3 +21,6 @@ php_version: 7.2 # "postgresql_version: 10.3" fails (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 18.04) postgresql_version: 10 systemd_location: /lib/systemd/system +# To upgrade U18's Calibre 3.21 to something much better: +calibre_via_debs: False +calibre_via_python: True From 1e2253a48850b2084a129ee72f09f0f567250214 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:47:38 -0400 Subject: [PATCH 09/51] Update default_vars.yml --- vars/default_vars.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 2c6a94a62..acdb2be74 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -240,6 +240,11 @@ idmgr_enables: False calibre_install: True calibre_enabled: True +# Try to force installation of a later Calibre (SEE vars/raspbian-9.yml) +calibre_via_debs: False +calibre_unstable_debs: False +# Try to force installation of latest x86_64 Calibre (SEE vars/ubuntu-18.yml) +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 From b6388ff79cb46f4ba44f7d57c5b61390c67d33d9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 16:47:45 -0400 Subject: [PATCH 10/51] Update medium.localvars --- vars/medium.localvars | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vars/medium.localvars b/vars/medium.localvars index 280d93499..287d4b6c7 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -122,6 +122,11 @@ iiab_usb_lib_show_all: True calibre_install: True calibre_enabled: True +# Try to force installation of a later Calibre (SEE vars/raspbian-9.yml) +calibre_via_debs: False +calibre_unstable_debs: False +# Try to force installation of latest x86_64 Calibre (SEE vars/ubuntu-18.yml) +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 From 377335a89067142268118e91ca6515dffb069bbe Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 19:49:30 -0400 Subject: [PATCH 11/51] Update raspbian-9.yml --- vars/raspbian-9.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index 6567daba9..954dccdf4 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -21,7 +21,7 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.6 systemd_location: /lib/systemd/system -# Under Consideration: (to avoid ~10 day delay after each Calibre release) -#calibre_via_debs: True -# roles/calibre/tasks/py-installer.yml likely to fail on ARM as of early 2018: +# Usually released 5-to-10 days after Calibre's quasi-monthly releases: +calibre_via_debs: True +# roles/calibre/tasks/py-installer.yml FAILS on ARM as 2018-05-10: #calibre_via_python: True From f302d0a7d120f2664ded18b1fdfa52cd555d666d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 19:57:14 -0400 Subject: [PATCH 12/51] Update raspbian-9.yml --- vars/raspbian-9.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index 954dccdf4..fbda3d7d6 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -23,5 +23,5 @@ postgresql_version: 9.6 systemd_location: /lib/systemd/system # Usually released 5-to-10 days after Calibre's quasi-monthly releases: calibre_via_debs: True -# roles/calibre/tasks/py-installer.yml FAILS on ARM as 2018-05-10: +# roles/calibre/tasks/py-installer.yml FAILS on ARM as of 2018-05-10: #calibre_via_python: True From aa072077fa54402795c60833b2289ec374291966 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 20:08:20 -0400 Subject: [PATCH 13/51] Update ubuntu-16.yml --- vars/ubuntu-16.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml index 741e3b012..db447f527 100644 --- a/vars/ubuntu-16.yml +++ b/vars/ubuntu-16.yml @@ -19,3 +19,6 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.5 systemd_location: /lib/systemd/system +# To upgrade Ubuntu 16.04's Calibre 2.55.0 to something much better: +calibre_via_debs: False +calibre_via_python: True From 836e27c6e4c9a2bf82da82a07bcc4ac6af9a2b8f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 20:08:23 -0400 Subject: [PATCH 14/51] Update ubuntu-17.yml --- vars/ubuntu-17.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/ubuntu-17.yml b/vars/ubuntu-17.yml index 41fd02c1d..5de14fc61 100644 --- a/vars/ubuntu-17.yml +++ b/vars/ubuntu-17.yml @@ -19,3 +19,6 @@ sshd_service: ssh php_version: 7.1 postgresql_version: 9.6 systemd_location: /lib/systemd/system +# To upgrade Ubuntu 17.10's Calibre 3.7.0 to something much better: +calibre_via_debs: False +calibre_via_python: True From a218351a10fdb92d835bedb4ee94244154a63a9f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 20:08:28 -0400 Subject: [PATCH 15/51] Update raspbian-9.yml --- vars/raspbian-9.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index fbda3d7d6..8269a4d14 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -24,4 +24,4 @@ systemd_location: /lib/systemd/system # Usually released 5-to-10 days after Calibre's quasi-monthly releases: calibre_via_debs: True # roles/calibre/tasks/py-installer.yml FAILS on ARM as of 2018-05-10: -#calibre_via_python: True +calibre_via_python: False From 0d1f095259fa772d014a1c387ceedd8e70aad47b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 20:08:31 -0400 Subject: [PATCH 16/51] Update ubuntu-18.yml --- vars/ubuntu-18.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/ubuntu-18.yml b/vars/ubuntu-18.yml index 17068759e..7e1d469ab 100644 --- a/vars/ubuntu-18.yml +++ b/vars/ubuntu-18.yml @@ -21,6 +21,6 @@ php_version: 7.2 # "postgresql_version: 10.3" fails (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 18.04) postgresql_version: 10 systemd_location: /lib/systemd/system -# To upgrade U18's Calibre 3.21 to something much better: +# To upgrade Ubuntu 18.04's Calibre 3.21.0 to something much better: calibre_via_debs: False calibre_via_python: True From 430d658ab58fcc90166839c4aab3c8ab45366ddd Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:05:15 -0400 Subject: [PATCH 17/51] 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 12f86f797..2fdd5cfdc 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -15,7 +15,7 @@ # within about 10 days of Calibre's quasi-monthly releases # (https://calibre-ebook.com/whats-new). -# If you want the latest Calibre, run the appropriate below script standalone. +# If you want the latest Calibre, run the appropriate below script, standalone. # HOWEVER: it's strongly suggested you wait for apt (blessed by your OS!) - name: Upgrade to Calibre testing .deb's - target Raspbian (rpi) From 26cf524f24052ffcd5950af0509c8ded53cd358a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:14:15 -0400 Subject: [PATCH 18/51] Update calibre-install-unstable.sh --- scripts/calibre-install-unstable.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index c27bfebf5..bb2af7383 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -1,11 +1,13 @@ #!/bin/bash -# Thanks to Jerry Vonau (https://github.com/jvonau) who made -# this critical breakthrough possible! -# might break future updates, you have been warned -# The latest available is 3.20 available from testing +# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical +# breakthrough possible! +# +# Calibre 3.23 is the latest available from testing as of 2018-05-10: # https://packages.debian.org/search?keywords=calibre -# might break future updates, you have been warned +# (SEE ALSO http://deb.debian.org/debian/pool/main/c/calibre/ ?) +# +# Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive # Updates to calibre & calibre-bin to "very latest" 3.x from unstable From 56cf3e10b4bb2d32a4673a578669b2e26477e9c2 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:15:09 -0400 Subject: [PATCH 19/51] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index aebc86ca1..4fb4c5460 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -1,11 +1,13 @@ #!/bin/bash -# Thanks to Jerry Vonau (https://github.com/jvonau) who made -# this critical breakthrough for Calibre 3.x possible! -# The latest available is 3.20 available from testing +# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical +# breakthrough possible! +# +# Calibre 3.23 is the latest available from testing as of 2018-05-10: # https://packages.debian.org/search?keywords=calibre -# (SEE http://deb.debian.org/debian/pool/main/c/calibre/ ?) -# might break future updates, you have been warned +# (SEE ALSO http://deb.debian.org/debian/pool/main/c/calibre/ ?) +# +# Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive # Drags in stock desktop dependencies without too much from testing below From 6363555f7e2d155406e3203b6bb1ce0c17791435 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:18:23 -0400 Subject: [PATCH 20/51] Update calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index 941f29306..56a35a70a 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/scripts/calibre-install-latest-rpi.sh @@ -1,12 +1,16 @@ #!/bin/bash -# Thanks to Jerry Vonau (https://github.com/jvonau) who made -# this critical breakthrough (Calibre 3.x on Raspbian) possible! -# The latest available is 3.21 available from testing -# https://packages.debian.org/search?keywords=calibre -# (SEE http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/ -# OR http://archive.raspbian.org/raspbian/pool/main/c/calibre/ ?) -# Might break future updates, you have been warned. +# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical +# breakthrough possible! +# +# Calibre 3.23 is the latest available from testing as of 2018-05-10: +# +# http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/ +# http://archive.raspbian.org/raspbian/pool/main/c/calibre/ +# https://packages.debian.org/search?keywords=calibre +# http://deb.debian.org/debian/pool/main/c/calibre/ +# +# Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive # Updates calibre calibre-bin to version 3.21 or ... from testing From 81ce4135953360a7d71e4f04ec12a42dcfb9a38e Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:25:48 -0400 Subject: [PATCH 21/51] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index 4fb4c5460..8d1d60f2b 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -4,15 +4,18 @@ # breakthrough possible! # # Calibre 3.23 is the latest available from testing as of 2018-05-10: -# https://packages.debian.org/search?keywords=calibre -# (SEE ALSO http://deb.debian.org/debian/pool/main/c/calibre/ ?) +# +# https://packages.debian.org/search?keywords=calibre +# http://deb.debian.org/debian/pool/main/c/calibre/ +# http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/ +# http://archive.raspbian.org/raspbian/pool/main/c/calibre/ # # Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive # Drags in stock desktop dependencies without too much from testing below apt -y install calibre-bin dirmngr -# Updates calibre calibre-bin to version 3.20 or ... from testing +# Prepare to update to latest from testing apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian testing main" >> /etc/apt/sources.list.d/debian-testing.list apt update From c550b28e478592e1ecb219b9d93d71eb76657076 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:27:54 -0400 Subject: [PATCH 22/51] apt-key...keyserver.ubuntu.com (in case calibre-install-latest.sh was never run?) --- scripts/calibre-install-unstable.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index bb2af7383..972c4a2e3 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -4,13 +4,17 @@ # breakthrough possible! # # Calibre 3.23 is the latest available from testing as of 2018-05-10: -# https://packages.debian.org/search?keywords=calibre -# (SEE ALSO http://deb.debian.org/debian/pool/main/c/calibre/ ?) +# +# https://packages.debian.org/search?keywords=calibre +# http://deb.debian.org/debian/pool/main/c/calibre/ +# http://raspbian.raspberrypi.org/raspbian/pool/main/c/calibre/ +# http://archive.raspbian.org/raspbian/pool/main/c/calibre/ # # Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive -# Updates to calibre & calibre-bin to "very latest" 3.x from unstable +# Prepare to update to latest from unstable +apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list.d/unstable.list apt update apt -y install calibre calibre-bin From 1e84e6839d13fe614584326eac2fc25d330a6f57 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:32:34 -0400 Subject: [PATCH 23/51] Update calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index 56a35a70a..ebc55ec1b 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/scripts/calibre-install-latest-rpi.sh @@ -13,11 +13,11 @@ # Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive -# Updates calibre calibre-bin to version 3.21 or ... from testing +# Prepare to update to latest from testing echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list apt update apt -y install calibre calibre-bin -# Remove last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list +# Remove last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Clears the cache of testing apt update From 4f3f33fa3d6b81123641aa1bfd9e94a554b69fbb Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:32:40 -0400 Subject: [PATCH 24/51] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index 8d1d60f2b..449c9a32f 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -22,4 +22,5 @@ apt update apt -y install libqt5core5a python-lxml calibre # Remove last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list sed -i '$ d' /etc/apt/sources.list.d/debian-testing.list +# Clears the cache of testing apt update From 527c571b11f0f8a4d1069d984c63bf780c32ecc5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 21:32:46 -0400 Subject: [PATCH 25/51] Update calibre-install-unstable.sh --- scripts/calibre-install-unstable.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index 972c4a2e3..f61ab898c 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -18,7 +18,7 @@ apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list.d/unstable.list apt update apt -y install calibre calibre-bin -# Remove last line, safer than: rm /etc/apt/sources.list.d/debian-unstable.list +# Remove last line, safer than: rm /etc/apt/sources.list.d/unstable.list sed -i '$ d' /etc/apt/sources.list.d/unstable.list # Clears the cache of testing and unstable apt update From 30b9ab0e93e2b57faa047d155246244bf07feecc Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 22:55:08 -0400 Subject: [PATCH 26/51] Update debian-9.yml --- vars/debian-9.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vars/debian-9.yml b/vars/debian-9.yml index a945d779b..2eec10bc8 100644 --- a/vars/debian-9.yml +++ b/vars/debian-9.yml @@ -19,5 +19,6 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.6 systemd_location: /lib/systemd/system - - +# To upgrade OS's own Calibre to something much better: +calibre_via_debs: False +calibre_via_python: True From 1f93e85d0a56d04a04e901184eff5291d764aef4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 22:55:39 -0400 Subject: [PATCH 27/51] Update centos-7.yml --- vars/centos-7.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/centos-7.yml b/vars/centos-7.yml index 79a654af3..68dbf1b78 100644 --- a/vars/centos-7.yml +++ b/vars/centos-7.yml @@ -18,3 +18,6 @@ sshd_service: sshd php_version: 7.0 postgresql_version: 9.5 systemd_location: /usr/lib/systemd/system +# To upgrade OS's own Calibre to something much better: +calibre_via_debs: False +calibre_via_python: True From cae132c84eae87526e8d5cda73622830e9cc043d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 22:55:55 -0400 Subject: [PATCH 28/51] Update fedora-22.yml --- vars/fedora-22.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/fedora-22.yml b/vars/fedora-22.yml index f12a394c2..cf6afd780 100644 --- a/vars/fedora-22.yml +++ b/vars/fedora-22.yml @@ -14,3 +14,6 @@ mysql_service: mariadb apache_log: /var/log/httpd/access_log sshd_service: sshd systemd_location: /usr/lib/systemd/system +# To upgrade OS's own Calibre to something much better: +calibre_via_debs: False +calibre_via_python: True From 271384a33d5324d6a2c389e6a7857b45af23202d Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:07:18 -0400 Subject: [PATCH 29/51] Update centos-7.yml --- vars/centos-7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/centos-7.yml b/vars/centos-7.yml index 68dbf1b78..82b7fb824 100644 --- a/vars/centos-7.yml +++ b/vars/centos-7.yml @@ -18,6 +18,6 @@ sshd_service: sshd php_version: 7.0 postgresql_version: 9.5 systemd_location: /usr/lib/systemd/system -# To upgrade OS's own Calibre to something much better: +# Upgrade OS's own Calibre to very latest: calibre_via_debs: False calibre_via_python: True From 56348714d29280315b68119bb29c53398aacccda Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:07:42 -0400 Subject: [PATCH 30/51] Update debian-9.yml --- vars/debian-9.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/debian-9.yml b/vars/debian-9.yml index 2eec10bc8..6477bf86f 100644 --- a/vars/debian-9.yml +++ b/vars/debian-9.yml @@ -19,6 +19,6 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.6 systemd_location: /lib/systemd/system -# To upgrade OS's own Calibre to something much better: +# Upgrade OS's own Calibre to very latest: calibre_via_debs: False calibre_via_python: True From 3022d7b82a34eca0cfa1873352149c1eb1020de5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:08:15 -0400 Subject: [PATCH 31/51] Update fedora-22.yml --- vars/fedora-22.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/fedora-22.yml b/vars/fedora-22.yml index cf6afd780..986a58f1b 100644 --- a/vars/fedora-22.yml +++ b/vars/fedora-22.yml @@ -14,6 +14,6 @@ mysql_service: mariadb apache_log: /var/log/httpd/access_log sshd_service: sshd systemd_location: /usr/lib/systemd/system -# To upgrade OS's own Calibre to something much better: +# Upgrade OS's own Calibre to very latest: calibre_via_debs: False calibre_via_python: True From 14e477fa611fb36d21e453e3aa41f484eec0dff5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:08:52 -0400 Subject: [PATCH 32/51] Update ubuntu-16.yml --- vars/ubuntu-16.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml index db447f527..2d1e28283 100644 --- a/vars/ubuntu-16.yml +++ b/vars/ubuntu-16.yml @@ -19,6 +19,6 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.5 systemd_location: /lib/systemd/system -# To upgrade Ubuntu 16.04's Calibre 2.55.0 to something much better: +# Upgrade Ubuntu 16.04's Calibre 2.55.0 to very latest: calibre_via_debs: False calibre_via_python: True From 656b83c6a2c5fde636c26f4087201349fc89f19f Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:09:20 -0400 Subject: [PATCH 33/51] Update ubuntu-17.yml --- vars/ubuntu-17.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/ubuntu-17.yml b/vars/ubuntu-17.yml index 5de14fc61..ac3b285c7 100644 --- a/vars/ubuntu-17.yml +++ b/vars/ubuntu-17.yml @@ -19,6 +19,6 @@ sshd_service: ssh php_version: 7.1 postgresql_version: 9.6 systemd_location: /lib/systemd/system -# To upgrade Ubuntu 17.10's Calibre 3.7.0 to something much better: +# Upgrade Ubuntu 17.10's Calibre 3.7.0 to very latest: calibre_via_debs: False calibre_via_python: True From 6e589b6cdda504f11e0f5a833d4a8799e9023e12 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:10:16 -0400 Subject: [PATCH 34/51] Update ubuntu-18.yml --- vars/ubuntu-18.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/ubuntu-18.yml b/vars/ubuntu-18.yml index 7e1d469ab..9fb269ac9 100644 --- a/vars/ubuntu-18.yml +++ b/vars/ubuntu-18.yml @@ -21,6 +21,6 @@ php_version: 7.2 # "postgresql_version: 10.3" fails (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 18.04) postgresql_version: 10 systemd_location: /lib/systemd/system -# To upgrade Ubuntu 18.04's Calibre 3.21.0 to something much better: +# Upgrade Ubuntu 18.04's Calibre 3.21.0 to very latest: calibre_via_debs: False calibre_via_python: True From b59750ff699691f917c20a49a851abd1ed3f7fb3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:21:33 -0400 Subject: [PATCH 35/51] 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 d00d6aada..943312707 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -12,7 +12,7 @@ calibre_sample_book: "Metamorphosis-jackson.epub" calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py" -# USE TO TEST debs.yml (RASPBIAN APPROACH!) ON DEBIAN 9.X +# 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 calibre unstable: (moved to vars/default_vars.yml) +# Enable unstable .deb's, not just testing .deb's: (moved to vars/default_vars.yml) #calibre_unstable_debs: False From 3b1178dc6cfca32f3e7bdc3b6b67aa384ae64899 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:22:55 -0400 Subject: [PATCH 36/51] 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 943312707..f135ee6f2 100644 --- a/roles/calibre/defaults/main.yml +++ b/roles/calibre/defaults/main.yml @@ -14,5 +14,5 @@ calibre_src_url: "https://raw.githubusercontent.com/kovidgoyal/calibre/master/se # 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 vars/default_vars.yml) +# Enable unstable .deb's, not just testing .deb's: (moved to vars/local_vars.yml & vars/default_vars.yml) #calibre_unstable_debs: False From 2af5e8781a99ad1c20c65691a42af88a3732b6e1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:59:37 -0400 Subject: [PATCH 37/51] Update calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index ebc55ec1b..a5d520bda 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/scripts/calibre-install-latest-rpi.sh @@ -13,11 +13,11 @@ # Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive -# Prepare to update to latest from testing +# Prepares to update to latest from testing echo "deb http://raspbian.raspberrypi.org/raspbian/ testing main" > /etc/apt/sources.list.d/rpi-testing.list apt update apt -y install calibre calibre-bin -# Remove last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list +# Removes last line, safer than: rm /etc/apt/sources.list.d/rpi-testing.list sed -i '$ d' /etc/apt/sources.list.d/rpi-testing.list # Clears the cache of testing apt update From 463877e105ef9aef1a3150af1edee6ccf95626be Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 10 May 2018 23:59:58 -0400 Subject: [PATCH 38/51] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index 449c9a32f..7153b13c7 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -15,12 +15,12 @@ export DEBIAN_FRONTEND=noninteractive # Drags in stock desktop dependencies without too much from testing below apt -y install calibre-bin dirmngr -# Prepare to update to latest from testing +# Prepares to update to latest from testing apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian testing main" >> /etc/apt/sources.list.d/debian-testing.list apt update apt -y install libqt5core5a python-lxml calibre -# Remove last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list +# Removes last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list sed -i '$ d' /etc/apt/sources.list.d/debian-testing.list # Clears the cache of testing apt update From 83b050f3fe9ec5a4e2656ec0cb813689a9c1415e Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 00:00:18 -0400 Subject: [PATCH 39/51] Update calibre-install-unstable.sh --- scripts/calibre-install-unstable.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-unstable.sh b/scripts/calibre-install-unstable.sh index f61ab898c..abb950f7c 100755 --- a/scripts/calibre-install-unstable.sh +++ b/scripts/calibre-install-unstable.sh @@ -13,12 +13,12 @@ # Might break future updates; you have been warned. export DEBIAN_FRONTEND=noninteractive -# Prepare to update to latest from unstable +# Prepares to update to latest from unstable apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list.d/unstable.list apt update apt -y install calibre calibre-bin -# Remove last line, safer than: rm /etc/apt/sources.list.d/unstable.list +# Removes last line, safer than: rm /etc/apt/sources.list.d/unstable.list sed -i '$ d' /etc/apt/sources.list.d/unstable.list # Clears the cache of testing and unstable apt update From a387e6bcbff23d695fdbad2525fd4d4f39306c2a Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 01:29:31 -0400 Subject: [PATCH 40/51] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index 7153b13c7..37764db79 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -14,12 +14,12 @@ export DEBIAN_FRONTEND=noninteractive # Drags in stock desktop dependencies without too much from testing below -apt -y install calibre-bin dirmngr +apt -y install dirmngr # Prepares to update to latest from testing apt-key adv --recv-key --keyserver keyserver.ubuntu.com 7638D0442B90D010 echo "deb http://deb.debian.org/debian testing main" >> /etc/apt/sources.list.d/debian-testing.list apt update -apt -y install libqt5core5a python-lxml calibre +apt -y install libqt5core5a python-lxml calibre calibre-bin # Removes last line, safer than: rm /etc/apt/sources.list.d/debian-testing.list sed -i '$ d' /etc/apt/sources.list.d/debian-testing.list # Clears the cache of testing From c688ad1caed981634894ace90aee7fa524a22b49 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 01:52:29 -0400 Subject: [PATCH 41/51] Update debian-8.yml --- vars/debian-8.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/debian-8.yml b/vars/debian-8.yml index 5b6153ce4..7d39b347b 100644 --- a/vars/debian-8.yml +++ b/vars/debian-8.yml @@ -18,3 +18,6 @@ sshd_service: ssh php_version: 5 postgresql_version: 9.4 systemd_location: /lib/systemd/system +# Upgrade OS's own Calibre to very latest: +calibre_via_debs: False +calibre_via_python: True From f00ccec3a53867f54baf9b853a182cbeef8c1b7b Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 01:52:51 -0400 Subject: [PATCH 42/51] Update fedora-18.yml --- vars/fedora-18.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/fedora-18.yml b/vars/fedora-18.yml index db8395fe9..378463b84 100644 --- a/vars/fedora-18.yml +++ b/vars/fedora-18.yml @@ -18,3 +18,6 @@ sshd_service: sshd nextcloud_install: False nextcloud_enabled: False systemd_location: /usr/lib/systemd/system +# Upgrade OS's own Calibre to very latest: +calibre_via_debs: False +calibre_via_python: True From 5e180048d3be047401433c9fa6868ceadcccfb1d Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 02:07:16 -0400 Subject: [PATCH 43/51] Update raspbian-9.yml --- vars/raspbian-9.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index 8269a4d14..feacbf76e 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -21,7 +21,8 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.6 systemd_location: /lib/systemd/system -# Usually released 5-to-10 days after Calibre's quasi-monthly releases: +# Update from Raspbian Stretch's Calibre 2.75.1 (role/calibre/tasks/debs.yml). +# .deb's are released about 5-10 days after Calibre's quasi-monthly releases: calibre_via_debs: True # roles/calibre/tasks/py-installer.yml FAILS on ARM as of 2018-05-10: calibre_via_python: False From 42d58e767e4394249b00499dff77c0bf6e97599a Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 02:11:07 -0400 Subject: [PATCH 44/51] Update raspbian-8.yml --- vars/raspbian-8.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml index 1e1e42706..47b9eac3e 100644 --- a/vars/raspbian-8.yml +++ b/vars/raspbian-8.yml @@ -20,3 +20,8 @@ sshd_service: ssh php_version: 5 postgresql_version: 9.4 systemd_location: /lib/systemd/system +# Update from Raspbian Jessie's Calibre 2.5.0 (role/calibre/tasks/debs.yml). +# .deb's are released about 5-10 days after Calibre's quasi-monthly releases: +calibre_via_debs: True +# roles/calibre/tasks/py-installer.yml FAILS on ARM as of 2018-05-10: +calibre_via_python: False From b52efaae8043149eca49cc00b6f6cd9e9feef99d Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 02:17:13 -0400 Subject: [PATCH 45/51] Update raspbian-9.yml --- vars/raspbian-9.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/raspbian-9.yml b/vars/raspbian-9.yml index feacbf76e..4cc2d18b1 100644 --- a/vars/raspbian-9.yml +++ b/vars/raspbian-9.yml @@ -21,8 +21,8 @@ sshd_service: ssh php_version: 7.0 postgresql_version: 9.6 systemd_location: /lib/systemd/system -# Update from Raspbian Stretch's Calibre 2.75.1 (role/calibre/tasks/debs.yml). -# .deb's are released about 5-10 days after Calibre's quasi-monthly releases: +# Upgrade Raspbian Stretch's Calibre 2.75.1: (via role/calibre/tasks/debs.yml, +# with .deb's released about 5-10 days after Calibre's quasi-monthly releases) calibre_via_debs: True # roles/calibre/tasks/py-installer.yml FAILS on ARM as of 2018-05-10: calibre_via_python: False From f50422a3193bd0a50c86cd0ad7757e43a9e349fb Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 02:17:24 -0400 Subject: [PATCH 46/51] Update raspbian-8.yml --- vars/raspbian-8.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/raspbian-8.yml b/vars/raspbian-8.yml index 47b9eac3e..edbdd4606 100644 --- a/vars/raspbian-8.yml +++ b/vars/raspbian-8.yml @@ -20,8 +20,8 @@ sshd_service: ssh php_version: 5 postgresql_version: 9.4 systemd_location: /lib/systemd/system -# Update from Raspbian Jessie's Calibre 2.5.0 (role/calibre/tasks/debs.yml). -# .deb's are released about 5-10 days after Calibre's quasi-monthly releases: +# Upgrade Raspbian Jessie's Calibre 2.5.0: (via role/calibre/tasks/debs.yml, +# with .deb's released about 5-10 days after Calibre's quasi-monthly releases) calibre_via_debs: True # roles/calibre/tasks/py-installer.yml FAILS on ARM as of 2018-05-10: calibre_via_python: False From aa6f147d2ff8324e31ee0dec342c4ff742c2fad8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 02:25:56 -0400 Subject: [PATCH 47/51] Update medium.localvars --- vars/medium.localvars | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/medium.localvars b/vars/medium.localvars index 287d4b6c7..a73967e2f 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -122,10 +122,10 @@ iiab_usb_lib_show_all: True calibre_install: True calibre_enabled: True -# Try to force installation of a later Calibre (SEE vars/raspbian-9.yml) +# Force installation of a later Calibre (set by vars/raspbian-9.yml) calibre_via_debs: False calibre_unstable_debs: False -# Try to force installation of latest x86_64 Calibre (SEE vars/ubuntu-18.yml) +# Force installation of latest x86_64 Calibre (set by most OS's) calibre_via_python: False # Change calibre_port to 8010 if you're using XO laptops needing above idmgr calibre_port: 8080 From 1906bb8072e3520d232aebf54a15553524b69188 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 02:26:23 -0400 Subject: [PATCH 48/51] Update default_vars.yml --- vars/default_vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index acdb2be74..f61e53291 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -240,10 +240,10 @@ idmgr_enables: False calibre_install: True calibre_enabled: True -# Try to force installation of a later Calibre (SEE vars/raspbian-9.yml) +# Force installation of a later Calibre (set by vars/raspbian-9.yml) calibre_via_debs: False calibre_unstable_debs: False -# Try to force installation of latest x86_64 Calibre (SEE vars/ubuntu-18.yml) +# Force installation of latest x86_64 Calibre (set by most OS's) calibre_via_python: False # Change calibre_port to 8010 if you're using XO laptops needing above idmgr calibre_port: 8080 From 96be6a8cc7489f9de6eca403790caaf819423fc1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 02:55:33 -0400 Subject: [PATCH 49/51] Update medium.localvars --- vars/medium.localvars | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/medium.localvars b/vars/medium.localvars index a73967e2f..16d40fa1c 100644 --- a/vars/medium.localvars +++ b/vars/medium.localvars @@ -122,11 +122,11 @@ iiab_usb_lib_show_all: True calibre_install: True calibre_enabled: True -# Force installation of a later Calibre (set by vars/raspbian-9.yml) -calibre_via_debs: False +# Try .deb upgrade of Calibre (like vars/raspbian-9.yml already does) +# calibre_via_debs: True calibre_unstable_debs: False -# Force installation of latest x86_64 Calibre (set by most OS's) -calibre_via_python: 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 add your own mnemonic URL like: http://box/XYZ From 534d3686ab46de18948e9d7799224f350f6419b5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 03:00:30 -0400 Subject: [PATCH 50/51] Update default_vars.yml --- vars/default_vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index f61e53291..c13027222 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -240,10 +240,10 @@ idmgr_enables: False calibre_install: True calibre_enabled: True -# Force installation of a later Calibre (set by vars/raspbian-9.yml) +# Try .deb upgrade of Calibre (vars/raspbian-9.yml overrides this) calibre_via_debs: False calibre_unstable_debs: False -# Force installation of latest x86_64 Calibre (set by most OS's) +# Try python x86_64 upgrade of Calibre (vars/.yml override this) calibre_via_python: False # Change calibre_port to 8010 if you're using XO laptops needing above idmgr calibre_port: 8080 From eb23b0193d85dbc24093c2c0a18cc3b23178e5f1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 11 May 2018 03:08:33 -0400 Subject: [PATCH 51/51] Update default_vars.yml --- vars/default_vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index c13027222..6ea4238ec 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -240,10 +240,10 @@ idmgr_enables: False calibre_install: True calibre_enabled: True -# Try .deb upgrade of Calibre (vars/raspbian-9.yml overrides this) +# vars/raspbian-9.yml tries the .deb upgrade of Calibre, overriding this default: calibre_via_debs: False calibre_unstable_debs: False -# Try python x86_64 upgrade of Calibre (vars/.yml override this) +# vars/.yml try the x86_64 python upgrade of Calibre, overriding this default: calibre_via_python: False # Change calibre_port to 8010 if you're using XO laptops needing above idmgr calibre_port: 8080