From 65b0d5f1bfc6fb4714aa536e247f1285cec4ff15 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 14:36:14 -0400 Subject: [PATCH 01/15] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index b6be18fed..4c9ebb2c4 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -133,8 +133,8 @@ iiab_usb_lib_show_all: True # WARNING: CALIBRE REQUIRES X WINDOWS / OPENGL LIBRARIES. Consider installing # an OS that includes a GUI (desktop) environment if you need Calibre E-Books. -calibre_install: True -calibre_enabled: True +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 From 053d802105d0b1082c14c4418e0d0ca142a31ce6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 14:36:45 -0400 Subject: [PATCH 02/15] Update local_vars_medium_vpn.yml --- vars/local_vars_medium_vpn.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/local_vars_medium_vpn.yml b/vars/local_vars_medium_vpn.yml index 11d2af017..b68b23f20 100644 --- a/vars/local_vars_medium_vpn.yml +++ b/vars/local_vars_medium_vpn.yml @@ -133,8 +133,8 @@ iiab_usb_lib_show_all: True # WARNING: CALIBRE REQUIRES X WINDOWS / OPENGL LIBRARIES. Consider installing # an OS that includes a GUI (desktop) environment if you need Calibre E-Books. -calibre_install: True -calibre_enabled: True +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 From 1a836c21196248d920c02059776552e6de770629 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 16:53:46 -0400 Subject: [PATCH 03/15] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index 75142a5c2..bf748f158 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -8,7 +8,7 @@ export DEBIAN_FRONTEND=noninteractive # Drags in stock desktop dependencies without too much from testing below apt -y install dirmngr -# Prepares to update to latest from testing +# Prepares to update to latest from debian 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 72e234ef198bc8b90e17bb94a621c89e2cc0ccf1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 16:54:24 -0400 Subject: [PATCH 04/15] Update calibre-install-latest-rpi.sh --- scripts/calibre-install-latest-rpi.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/calibre-install-latest-rpi.sh b/scripts/calibre-install-latest-rpi.sh index 092cbb00c..869a4b64f 100755 --- a/scripts/calibre-install-latest-rpi.sh +++ b/scripts/calibre-install-latest-rpi.sh @@ -6,11 +6,12 @@ # SEE COMMENTS AT THE TOP OF scripts/calibre-install-packages.sh export DEBIAN_FRONTEND=noninteractive -# Prepares to update to latest from testing +# 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 calibre calibre-bin -# 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 +## 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 +rm /etc/apt/sources.list.d/rpi-testing.list # Clears the cache of testing apt update From 5d4fdbf5e28f862b9579024b3ecb3a7862e70c51 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 16:54:41 -0400 Subject: [PATCH 05/15] Update calibre-install-latest.sh --- scripts/calibre-install-latest.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/calibre-install-latest.sh b/scripts/calibre-install-latest.sh index bf748f158..c8bf11ebd 100755 --- a/scripts/calibre-install-latest.sh +++ b/scripts/calibre-install-latest.sh @@ -13,7 +13,8 @@ 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 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 +## 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 +rm /etc/apt/sources.list.d/debian-testing.list # Clears the cache of testing apt update From 8eece31a6556d0fbcf73f9542981bee819af619c Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 17:03:04 -0400 Subject: [PATCH 06/15] Create calibre-install-latest-rpi-plus.sh --- scripts/calibre-install-latest-rpi-plus.sh | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 scripts/calibre-install-latest-rpi-plus.sh diff --git a/scripts/calibre-install-latest-rpi-plus.sh b/scripts/calibre-install-latest-rpi-plus.sh new file mode 100644 index 000000000..0e4d89f4e --- /dev/null +++ b/scripts/calibre-install-latest-rpi-plus.sh @@ -0,0 +1,33 @@ + +#!/bin/bash + +# Calibre 3.27.1 .deb's were released for Raspbian 2018-07-22 but requires +# python-pyqt5 from debian testing, to overcome error: +# +# The following packages have unmet dependencies: +# calibre : Depends: python-pyqt5 (>= 5.11.2+dfsg-1) but 5.10.1+dfsg-2+rpi1 is to be installed +# +# More details @ https://github.com/iiab/iiab/issues/948 and +# https://www.mobileread.com/forums/showthread.php?p=3729117#post3729117 + +# Thanks to Jerry Vonau (https://github.com/jvonau) who made this critical +# breakthrough possible! +# +# SEE COMMENTS AT THE TOP OF scripts/calibre-install-packages.sh + +export DEBIAN_FRONTEND=noninteractive + +# Prepares to update from debian 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 python-pyqt5 +rm /etc/apt/sources.list.d/debian-testing.list + +# Prepares to update 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 calibre calibre-bin +rm /etc/apt/sources.list.d/rpi-testing.list +# Clears the cache of testing +apt update From c450a46f49fa2bd6ccdd2c6d87245b27848d3525 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 17:06:00 -0400 Subject: [PATCH 07/15] Update debs.yml --- roles/calibre/tasks/debs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index 0d13d9b9d..ea19185f7 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -28,7 +28,8 @@ # when: is_rpi and internet_available - name: Upgrade to latest Calibre using .deb's from testing (rpi) - command: scripts/calibre-install-latest-rpi.sh # SEEMS TO ONCE AGAIN WORK since Calibre 3.26.0 (Calibre 3.24-3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in Zero W) + command: scripts/calibre-install-latest-rpi-plus.sh # for Calibre 3.27.1+ starting 2018-07-22 -- PLEASE TEST IF BOOTABLE IN Zero W? + #command: scripts/calibre-install-latest-rpi.sh # SEEMS TO ONCE AGAIN WORK since Calibre 3.26.0 (Calibre 3.24-3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in 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 e756b27d23aa00c5aa032ef67bf534fc5fecd34a Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 17:10:14 -0400 Subject: [PATCH 08/15] Update debs.yml --- roles/calibre/tasks/debs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/calibre/tasks/debs.yml b/roles/calibre/tasks/debs.yml index ea19185f7..8fb0b04a8 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -28,8 +28,8 @@ # 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 # for Calibre 3.27.1+ starting 2018-07-22 -- PLEASE TEST IF BOOTABLE IN Zero W? - #command: scripts/calibre-install-latest-rpi.sh # SEEMS TO ONCE AGAIN WORK since Calibre 3.26.0 (Calibre 3.24-3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in Zero W) + command: scripts/calibre-install-latest-rpi-plus.sh # HOPE IT WORKS FOR Calibre 3.27.1+ starting 2018-07-22 -- PLEASE TEST IF BOOTABLE IN Zero W? + #command: scripts/calibre-install-latest-rpi.sh # WORKED FOR Calibre 3.26.0 (Calibre 3.24.x & 3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in 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 5cd441353cce39bd90282e4bcb7cccb6db832e43 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 17:11:00 -0400 Subject: [PATCH 09/15] 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 8fb0b04a8..43566b8fb 100644 --- a/roles/calibre/tasks/debs.yml +++ b/roles/calibre/tasks/debs.yml @@ -29,7 +29,7 @@ - name: Upgrade to latest Calibre using .deb's from testing (rpi) command: scripts/calibre-install-latest-rpi-plus.sh # HOPE IT WORKS FOR Calibre 3.27.1+ starting 2018-07-22 -- PLEASE TEST IF BOOTABLE IN Zero W? - #command: scripts/calibre-install-latest-rpi.sh # WORKED FOR Calibre 3.26.0 (Calibre 3.24.x & 3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in Zero W) + #command: scripts/calibre-install-latest-rpi.sh # WORKED FOR Calibre 3.26.x (Calibre 3.24.x & 3.25 required above prereq calibre-install-packages.sh then Debian's own calibre-install-latest.sh to be bootable in 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 2a854c1bb9af98fa914275015af0cc396e5e576b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 17:11:32 -0400 Subject: [PATCH 10/15] Update calibre-install-latest-rpi-plus.sh --- scripts/calibre-install-latest-rpi-plus.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/calibre-install-latest-rpi-plus.sh b/scripts/calibre-install-latest-rpi-plus.sh index 0e4d89f4e..cf9d5114c 100644 --- a/scripts/calibre-install-latest-rpi-plus.sh +++ b/scripts/calibre-install-latest-rpi-plus.sh @@ -1,4 +1,3 @@ - #!/bin/bash # Calibre 3.27.1 .deb's were released for Raspbian 2018-07-22 but requires From 11e0003705d76e6e02e2417552ca57e023e72182 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 22 Jul 2018 17:30:33 -0400 Subject: [PATCH 11/15] chmod +x scripts/calibre-install-latest-rpi-plus.sh --- scripts/calibre-install-latest-rpi-plus.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/calibre-install-latest-rpi-plus.sh diff --git a/scripts/calibre-install-latest-rpi-plus.sh b/scripts/calibre-install-latest-rpi-plus.sh old mode 100644 new mode 100755 From e3fda6ad2011268e2072c4d4d2e3619c2403723d Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 17:52:47 -0400 Subject: [PATCH 12/15] Revert "Calibre 3.27.1 glitch so remove from MEDIUM-sized local_vars.yml" --- vars/local_vars_medium.yml | 4 ++-- vars/local_vars_medium_vpn.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 4c9ebb2c4..b6be18fed 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -133,8 +133,8 @@ iiab_usb_lib_show_all: True # WARNING: CALIBRE REQUIRES X WINDOWS / OPENGL LIBRARIES. Consider installing # an OS that includes a GUI (desktop) environment if you need Calibre E-Books. -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 diff --git a/vars/local_vars_medium_vpn.yml b/vars/local_vars_medium_vpn.yml index b68b23f20..11d2af017 100644 --- a/vars/local_vars_medium_vpn.yml +++ b/vars/local_vars_medium_vpn.yml @@ -133,8 +133,8 @@ iiab_usb_lib_show_all: True # WARNING: CALIBRE REQUIRES X WINDOWS / OPENGL LIBRARIES. Consider installing # an OS that includes a GUI (desktop) environment if you need Calibre E-Books. -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 From 772a200a5ccd3a91eec54fe17ab86086d60269cb Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 18:49:32 -0400 Subject: [PATCH 13/15] Update main.yml --- roles/0-init/tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 9673811a2..749910ef3 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -10,7 +10,7 @@ first_run: True when: not NewInstall.stat.exists -# we need to inialize the ini file and only write the location and version sections once and only +# We need to inialize the ini file and only write the location and version sections once and only # once to preserve the install date and git hash. - name: Write iiab_ini.yml for the first time include_tasks: first_run.yml @@ -131,15 +131,15 @@ python_path: /usr/local/lib/python2.7/dist-packages/ when: is_debuntu -# for various reasons the mysql service can not be enabled on fedora 20, -# but 'mariadb', which is its real name can -# on fedora 18 we need to use 'mysqld' +# For various reasons the mysql service can not be enabled on fedora 20, +# but 'mariadb', which is its real name can. +# On Fedora 18 we need to use 'mysqld' -- name: Set mysqld_service to mariadb by default +- name: Set mysql_service to mariadb by default set_fact: mysql_service: mariadb -- name: Set mysqld_service to mysqld etc (Fedora 18) +- name: Set mysql_service to mysqld etc (Fedora 18) set_fact: mysql_service: mysqld no_NM_reload: True @@ -165,7 +165,7 @@ include_tasks: hostname.yml when: FQDN_changed -- name: Add version section +- name: Add 'runtime' to list of services at /etc/iiab/iiab.ini ini_file: dest: "{{ iiab_config_file }}" section: runtime From 881783dee2bad2dc82aded0089c3eb34a1f65902 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 22 Jul 2018 19:44:34 -0400 Subject: [PATCH 14/15] Update main.yml --- roles/nextcloud/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml index 3252efa43..136bfea1a 100644 --- a/roles/nextcloud/tasks/main.yml +++ b/roles/nextcloud/tasks/main.yml @@ -18,6 +18,7 @@ url: "{{ nextcloud_dl_url }}/{{ nextcloud_orig_src_file }}" dest: "{{ downloads_dir }}/{{ nextcloud_src_file }}" force: yes + validate_certs: False # TEMPORARY ON/AFTER 2018-07-22 AS download.nextcloud.com CERT EXPIRED: https://github.com/iiab/iiab/issues/954 timeout: "{{ download_timeout }}" when: internet_available and nextcloud_force_install async: 900 From 449fd3fafdc4b03386a7a17a7e1fb8c52a5d1c2f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 23 Jul 2018 08:05:13 -0400 Subject: [PATCH 15/15] Update main.yml --- roles/0-init/tasks/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index 749910ef3..b0223aa1e 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -10,8 +10,8 @@ first_run: True when: not NewInstall.stat.exists -# We need to inialize the ini file and only write the location and version sections once and only -# once to preserve the install date and git hash. +# We need to inialize the ini file and only write the location and version +# sections once and only once to preserve the install date and git hash. - name: Write iiab_ini.yml for the first time include_tasks: first_run.yml when: first_run @@ -41,7 +41,8 @@ exFAT_enabled: True when: xo_model != "none" -# Discover do we have a gateway? -- if ansible detects gateway, becomes WAN candidate +# Discover: do we have a gateway? +# If Ansible detects gateway, becomes WAN candidate. - name: Finding gateway set_fact: discovered_wan_iface: "{{ ansible_default_ipv4.alias }}" @@ -79,7 +80,7 @@ path: /tmp/heart-beat.txt state: absent -# Put all computed vars here so derive properly from any prior var file +# Put all computed vars here so derive properly from any prior var file. - name: If the TZ is not set in env, set it to UTC include_tasks: tz.yml @@ -98,10 +99,10 @@ mysql_install: True mysql_enabled: True -# we decided to enable mysql unconditionally +# We decided to enable mysql unconditionally. # when: elgg_enabled or rachel_enabled or owncloud_enabled or phpmyadmin_enabled or wordpress_enabled or iiab_menu_install -# Commenting out MongoDB on a trial basis, for a more basic/lightweight Sugarizer, per https://github.com/iiab/iiab/pull/427 +# Late 2017: Had commented out MongoDB on a trial basis, for a more basic/lightweight Sugarizer, per https://github.com/iiab/iiab/pull/427 - name: Turn on mongodb if sugarizer enabled set_fact: mongodb_install: True @@ -131,9 +132,8 @@ python_path: /usr/local/lib/python2.7/dist-packages/ when: is_debuntu -# For various reasons the mysql service can not be enabled on fedora 20, -# but 'mariadb', which is its real name can. -# On Fedora 18 we need to use 'mysqld' +# For various reasons the mysql service cannot be enabled on Fedora 20, but +# 'mariadb', which is its real name can. On Fedora 18 we need to use 'mysqld'. - name: Set mysql_service to mariadb by default set_fact: @@ -165,7 +165,7 @@ include_tasks: hostname.yml when: FQDN_changed -- name: Add 'runtime' to list of services at /etc/iiab/iiab.ini +- name: Add 'runtime' section alongside list of services at /etc/iiab/iiab.ini ini_file: dest: "{{ iiab_config_file }}" section: runtime