From 400742001d953457a9791182c44dcde0b0ab29e8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 15 Oct 2019 17:45:02 -0400 Subject: [PATCH 01/22] Recommend Ansible 2.9.0 --- scripts/ansible | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index a496e944c..b1f545e61 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -1,13 +1,13 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.8.5" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.9.0" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible (TO INSTALL ANSIBLE)" -echo -e 'Alternative: /opt/iiab/iiab/scripts/ansible-2.7.x ("Slow Food")\n' +echo -e 'Alternative: /opt/iiab/iiab/scripts/ansible-2.8.x ("Slow Food")\n' echo -e "RECOMMENDED PREREQUISITES:" echo -e "(1) Verify you're online" From 09fdba3ed1beda6af0c54b1c97b93cd9d00535bc Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 15 Oct 2019 17:46:20 -0400 Subject: [PATCH 02/22] Update and rename ansible-2.8.x to ansible-2.9.x --- scripts/{ansible-2.8.x => ansible-2.9.x} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename scripts/{ansible-2.8.x => ansible-2.9.x} (97%) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.9.x similarity index 97% rename from scripts/ansible-2.8.x rename to scripts/ansible-2.9.x index e9d8c0c95..aa93e7f86 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.9.x @@ -1,12 +1,12 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.8.5" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.9.0" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive -echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.8.x (TO INSTALL ANSIBLE)" +echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.9.x (TO INSTALL ANSIBLE)" echo -e 'Alternative: /opt/iiab/iiab/scripts/ansible ("for the very latest Ansible")\n' echo -e "RECOMMENDED PREREQUISITES:" From 05e3dad352d1137cbc3b604380f2835ee6343c6c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 15 Oct 2019 17:47:03 -0400 Subject: [PATCH 03/22] Update and rename ansible-2.7.x to ansible-2.8.x --- scripts/{ansible-2.7.x => ansible-2.8.x} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename scripts/{ansible-2.7.x => ansible-2.8.x} (97%) diff --git a/scripts/ansible-2.7.x b/scripts/ansible-2.8.x similarity index 97% rename from scripts/ansible-2.7.x rename to scripts/ansible-2.8.x index 81c8141b6..60b673f02 100755 --- a/scripts/ansible-2.7.x +++ b/scripts/ansible-2.8.x @@ -1,12 +1,12 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.7.13" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.8.5" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive -echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.7.x (TO INSTALL ANSIBLE)" +echo -e "\n\nYOU ARE RUNNING: /opt/iiab/iiab/scripts/ansible-2.8.x (TO INSTALL ANSIBLE)" echo -e 'Alternative: /opt/iiab/iiab/scripts/ansible ("for the very latest Ansible")\n' echo -e "RECOMMENDED PREREQUISITES:" From 00ae136dc020511b72c8d6f1981a2f93dbe267bb Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 15 Oct 2019 17:57:45 -0400 Subject: [PATCH 04/22] Update ansible-2.8.x --- scripts/ansible-2.8.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index 60b673f02..e15a4ee8d 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -68,7 +68,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n" apt update apt -y install dirmngr # Raspbian needs. Formerly: python-pip python-setuptools python-wheel patch - echo "deb http://ppa.launchpad.net/ansible/ansible-2.7/ubuntu xenial main" \ + echo "deb http://ppa.launchpad.net/ansible/ansible-2.8/ubuntu bionic main" \ > /etc/apt/sources.list.d/iiab-ansible.list echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n' @@ -88,7 +88,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian #wget http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb #apt -y --allow-downgrades install ./ansible_2.4.2.0-1ppa~xenial_all.deb - echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible-2.7/ubuntu xenial main"' + echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible-2.8/ubuntu bionic main"' echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n" echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO" From 82d5362f502fcd9933648e61b75b94d57ff4741c Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 15 Oct 2019 17:58:49 -0400 Subject: [PATCH 05/22] Update ansible-2.9.x --- scripts/ansible-2.9.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible-2.9.x b/scripts/ansible-2.9.x index aa93e7f86..162f19cde 100755 --- a/scripts/ansible-2.9.x +++ b/scripts/ansible-2.9.x @@ -68,7 +68,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n" apt update apt -y install dirmngr # Raspbian needs. Formerly: python-pip python-setuptools python-wheel patch - echo "deb http://ppa.launchpad.net/ansible/ansible-2.8/ubuntu xenial main" \ + echo "deb http://ppa.launchpad.net/ansible/ansible-2.9/ubuntu bionic main" \ > /etc/apt/sources.list.d/iiab-ansible.list echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n' @@ -88,7 +88,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian #wget http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb #apt -y --allow-downgrades install ./ansible_2.4.2.0-1ppa~xenial_all.deb - echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible-2.8/ubuntu xenial main"' + echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible-2.9/ubuntu bionic main"' echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n" echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO" From 942f0f72335d9d5fb286e8d1f6b0bb1eb4f6c4df Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 15 Oct 2019 18:00:13 -0400 Subject: [PATCH 06/22] Update scripts/ansible from "xenial" to "bionic" PPA's --- scripts/ansible | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ansible b/scripts/ansible index b1f545e61..e6b2bfe73 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -68,7 +68,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian echo -e "\napt update; install dirmngr; PPA to /etc/apt/sources.list.d/iiab-ansible.list\n" apt update apt -y install dirmngr # Raspbian needs. Formerly: python-pip python-setuptools python-wheel patch - echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main" \ + echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu bionic main" \ > /etc/apt/sources.list.d/iiab-ansible.list echo -e '\nIF YOU FACE ERROR "signatures couldn'"'"'t be verified because the public key is not available" THEN REPEATEDLY RE-RUN "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 93C4A3FD7BB9C367"\n' @@ -88,7 +88,7 @@ elif [ -f /etc/debian_version ]; then # Includes Debian, Ubuntu & Raspbian #wget http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb #apt -y --allow-downgrades install ./ansible_2.4.2.0-1ppa~xenial_all.deb - echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible/ubuntu xenial main"' + echo -e 'PPA source "deb http://ppa.launchpad.net/ansible/ansible/ubuntu bionic main"' echo -e "successfully saved to /etc/apt/sources.list.d/iiab-ansible.list\n" echo -e "IF *OTHER* ANSIBLE SOURCES APPEAR BELOW, PLEASE MANUALLY REMOVE THEM TO" From fec47ab1997ffd2b7978eff6a8b8e94e257f044e Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 16 Oct 2019 05:15:32 -0400 Subject: [PATCH 07/22] MIN_ANSIBLE_VER=2.8.5 (was 2.6.16) --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index adbbf69b7..1026713a8 100755 --- a/iiab-install +++ b/iiab-install @@ -10,7 +10,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ -MIN_ANSIBLE_VER=2.6.16 +MIN_ANSIBLE_VER=2.8.5 if [ ! -f /etc/iiab/local_vars.yml ]; then From 95fb8dfa860a40b9438c683d40ccbde6fb24cc23 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 Oct 2019 18:26:23 -0400 Subject: [PATCH 08/22] MIN_ANSIBLE_VER=2.8.6 --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 1026713a8..04d6a3d77 100755 --- a/iiab-install +++ b/iiab-install @@ -10,7 +10,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ -MIN_ANSIBLE_VER=2.8.5 +MIN_ANSIBLE_VER=2.8.6 if [ ! -f /etc/iiab/local_vars.yml ]; then From 4106e37e0d62508f6671555d21a52f6cdfcfa2a8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 17 Oct 2019 18:27:42 -0400 Subject: [PATCH 09/22] GOOD_VER="2.8.6" --- scripts/ansible-2.8.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index e15a4ee8d..6e314d998 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.8.5" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.8.6" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From 83e8c6cc4a40877d949061e7985d314e1f680fa9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 18 Oct 2019 15:37:05 -0400 Subject: [PATCH 10/22] MIN_ANSIBLE_VER=2.8.7 due to 2.8.6 lineinfile bug? --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index 04d6a3d77..c94bb5fec 100755 --- a/iiab-install +++ b/iiab-install @@ -10,7 +10,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ -MIN_ANSIBLE_VER=2.8.6 +MIN_ANSIBLE_VER=2.8.7 if [ ! -f /etc/iiab/local_vars.yml ]; then From 8a46a5bd01d0f3eeb39add1270c3b867301c1379 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 18 Oct 2019 15:38:02 -0400 Subject: [PATCH 11/22] GOOD_VER="2.8.7" due to 2.8.6 lineinfile bug? --- scripts/ansible-2.8.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ansible-2.8.x b/scripts/ansible-2.8.x index 6e314d998..921a13323 100755 --- a/scripts/ansible-2.8.x +++ b/scripts/ansible-2.8.x @@ -1,7 +1,7 @@ #!/bin/bash -e CURR_VER="undefined" # Ansible version you currently have installed -GOOD_VER="2.8.6" # For XO laptops (pip install) & CentOS (yum install rpm) +GOOD_VER="2.8.7" # For XO laptops (pip install) & CentOS (yum install rpm) # On other OS's we attempt the latest from PPA, which might be more recent export DEBIAN_FRONTEND=noninteractive From 434bbdf0d507b93865e1d555c0d81a945f74101f Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 20 Oct 2019 16:56:30 -0400 Subject: [PATCH 12/22] Update README.rst --- roles/kalite/README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kalite/README.rst b/roles/kalite/README.rst index f6f1a000a..354017eb8 100644 --- a/roles/kalite/README.rst +++ b/roles/kalite/README.rst @@ -22,7 +22,7 @@ After your Internet-in-a-Box (IIAB) is completely installed, log in to KA Lite t Bulk Downloading Videos ----------------------- -Videos and their corresponding PNG thumbnail images can be copied into /library/ka-lite/content and will be recognized the next time KA Lite is started. +Videos and their corresponding PNG thumbnail images can be copied into /library/ka-lite/content — then log in to http://box.lan:8008 and click the "Videos" tab -> "Scan content folder for videos" (which might take a few minutes to complete!) Please see http://FAQ.IIAB.IO ("KA Lite Administration: What tips & tricks exist?") to use BitTorrent to download compressed KA Lite videos, that are much smaller than the ones downloaded via KA Lite's administrative interface. @@ -36,7 +36,7 @@ Look at `role/kalite/defaults/main.yml Date: Sun, 20 Oct 2019 17:01:04 -0400 Subject: [PATCH 13/22] kalite/tasks/main.yml readability --- roles/kalite/tasks/main.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml index d067c6041..2656d3790 100644 --- a/roles/kalite/tasks/main.yml +++ b/roles/kalite/tasks/main.yml @@ -43,15 +43,15 @@ option: "{{ item.option }}" value: "{{ item.value }}" with_items: - - option: name - value: "KA Lite" - - option: description - value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students want to track their own progress."' - - option: path - value: "{{ kalite_root }}" - - option: port - value: "{{ kalite_server_port }}" - - option: kalite_enabled - value: "{{ kalite_enabled }}" - - option: cron_enabled - value: "{{ kalite_cron_enabled }}" + - option: name + value: "KA Lite" + - option: description + value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students want to track their own progress."' + - option: kalite_root + value: "{{ kalite_root }}" + - option: kalite_server_port + value: "{{ kalite_server_port }}" + - option: kalite_enabled + value: "{{ kalite_enabled }}" + - option: kalite_cron_enabled + value: "{{ kalite_cron_enabled }}" From 6da31ac3119a53eec787b7fdb7afe6bfddd214c7 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 20 Oct 2019 17:04:56 -0400 Subject: [PATCH 14/22] kalite/tasks/install.yml cleaner/readability --- roles/kalite/tasks/install.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 77eff2871..a5addc38f 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -1,16 +1,14 @@ -# This is for an OS other than Fedora 18 +# For OS's other than Fedora 18 -- name: Install missing packages required for KA Lite startup +- name: Install package python-virtualenv required for KA Lite startup package: - name: "{{ item }}" + name: python-virtualenv state: present - with_items: - - python-virtualenv -- name: Download KA Lite's requirements file +- name: Download KA Lite's requirements file to {{ pip_packages_dir }}/kalite.txt get_url: url: "{{ kalite_requirements }}" - dest: "{{ pip_packages_dir }}/kalite.txt" + dest: "{{ pip_packages_dir }}/kalite.txt" # /opt/iiab/pip-packages/kalite.txt timeout: "{{ download_timeout }}" when: internet_available | bool @@ -57,6 +55,7 @@ - name: Remove libgeos-* pkgs, avoiding KA Lite Django failure on Ubermix shell: apt -y remove "libgeos-*" +# 2019-10-20: For Fedora 18 legacy (XO laptops) specially - name: Default is to have cronserve started with KA Lite set_fact: job_scheduler_stanza: "" @@ -66,7 +65,7 @@ job_scheduler_stanza: "--skip-job-scheduler " when: not kalite_cron_enabled -- name: Create 'kalite-serve' service, kalite.sh and kalite.conf +- name: "Install from template: venv wrapper /usr/bin/kalite, systemd unit file kalite-serve.service, Apache's kalite.conf" template: backup: no src: "{{ item.src }}" @@ -75,8 +74,8 @@ group: root mode: "{{ item.mode }}" with_items: - - { src: 'kalite-serve.service.j2', dest: '/etc/systemd/system/kalite-serve.service', mode: '0644'} - { src: 'kalite.sh.j2', dest: '/usr/bin/kalite', mode: '0755'} + - { src: 'kalite-serve.service.j2', dest: '/etc/systemd/system/kalite-serve.service', mode: '0644'} - { src: 'kalite.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'} - name: Fix KA Lite bug in regex parsing ifconfig output, for @m-anish's network names that contain dashes From f031ef6cfb3690a4109f202d22178376fd27172c Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 20 Oct 2019 17:06:03 -0400 Subject: [PATCH 15/22] kalite/tasks/setup.yml cleaner/readability --- roles/kalite/tasks/setup.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/kalite/tasks/setup.yml b/roles/kalite/tasks/setup.yml index b8812d103..d0f6404e1 100644 --- a/roles/kalite/tasks/setup.yml +++ b/roles/kalite/tasks/setup.yml @@ -1,16 +1,16 @@ -# This is for an OS other than Fedora 18 +# For OS's other than Fedora 18 -- name: Create kalite_root directory +- name: Create {{ kalite_root }} directory file: - path: "{{ kalite_root }}/httpsrv/static" + path: "{{ kalite_root }}/httpsrv/static" # /library/ka-lite owner: root group: root mode: 0755 state: directory - name: Run the setup using 'kalite manage' - command: "{{ kalite_program }} manage setup --username={{ kalite_admin_user }} --password={{ kalite_admin_password }} --noinput" + command: "{{ kalite_program }} manage setup --username={{ kalite_admin_user }} --password={{ kalite_admin_password }} --noinput" # Runs /usr/local/kalite/venv/bin/kalite environment: - KALITE_HOME: "{{ kalite_root }}" + KALITE_HOME: "{{ kalite_root }}" # /library/ka-lite async: 1800 poll: 10 From 36efd72c00f88341f67d6d0f4d5a32f1434735e5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 20 Oct 2019 17:22:43 -0400 Subject: [PATCH 16/22] kalite/tasks/enable.yml cleaner/readability --- roles/kalite/tasks/enable.yml | 36 +++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/roles/kalite/tasks/enable.yml b/roles/kalite/tasks/enable.yml index 7a95aabeb..f749bf6c6 100644 --- a/roles/kalite/tasks/enable.yml +++ b/roles/kalite/tasks/enable.yml @@ -1,31 +1,39 @@ # By the time we get here we should have ka-lite of some version # And the systemd unit files should be defined -- name: Enable 'kalite-serve' service - service: +- name: Enable & (re)start 'kalite-serve' service + systemd: + daemon_reload: yes name: kalite-serve enabled: yes - state: started + state: restarted + when: kalite_enabled -- name: Disable 'kalite-serve' service - service: +- name: Disable & stop 'kalite-serve' service + systemd: name: kalite-serve enabled: no state: stopped when: not kalite_enabled -# Since Fedora 18 we don't have a separate unit file for kalite-cron +# 2019-10-20: Below is for Fedora 18 (XO laptops) only. +# Since F18 we don't have a separate unit file for kalite-cron. +# +# SEE --skip-job-scheduler @ https://ka-lite.readthedocs.io/en/latest/usermanual/cli.html +# ...as implemented in templates/kalite-serve.service.j2 +# ...if not kalite_cron_enabled +# ...using {{ job_scheduler_stanza }} from kalite/tasks/install.yml -- name: Disable kalite cron server F18 +- name: Enable & (re)start 'kalite-cron' service (F18) + service: + name: kalite-cron + enabled: yes + state: restarted + when: kalite_cron_enabled and is_F18 + +- name: Disable & stop 'kalite-cron' service (F18) service: name: kalite-cron enabled: no state: stopped when: not kalite_cron_enabled and is_F18 - -- name: Enable kalite cron server F18 - service: - name: kalite-cron - enabled: yes - state: started - when: kalite_cron_enabled and is_F18 From 84071f6db1a2937858cec0320d39826cabf1fe90 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 20 Oct 2019 17:31:09 -0400 Subject: [PATCH 17/22] Show {{ kalite_requirements }} URL during install --- roles/kalite/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index a5addc38f..f421d2ad2 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -5,7 +5,7 @@ name: python-virtualenv state: present -- name: Download KA Lite's requirements file to {{ pip_packages_dir }}/kalite.txt +- name: Download {{ kalite_requirements }} to {{ pip_packages_dir }}/kalite.txt get_url: url: "{{ kalite_requirements }}" dest: "{{ pip_packages_dir }}/kalite.txt" # /opt/iiab/pip-packages/kalite.txt From d7ca00fa24a6fbe18f1185a4185db600c3e46eea Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 20 Oct 2019 17:46:53 -0400 Subject: [PATCH 18/22] Clarify {{ kalite_env }} during pip install of KA Lite --- roles/kalite/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index f421d2ad2..725820c76 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -20,7 +20,7 @@ # extra_args="--disable-pip-version-check" # when: internet_available and is_debuntu -- name: Install KA Lite static with pip (debuntu) +- name: Install KA Lite static to {{ kalite_venv }}, using pip (debuntu) pip: name: ka-lite-static version: "{{ kalite_version }}" @@ -38,7 +38,7 @@ # extra_args="--disable-pip-version-check" # when: internet_available and not is_debuntu -- name: Install KA Lite static with pip (OS's other than debuntu) +- name: Install KA Lite static to {{ kalite_venv }}, using pip (OS's other than debuntu) pip: name: ka-lite-static version: "{{ kalite_version }}" From b685ce21a47edc4dea0711ec2a7f97734a2176f8 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 20 Oct 2019 17:53:07 -0400 Subject: [PATCH 19/22] Update install.yml --- roles/kalite/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 725820c76..89312d114 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -1,6 +1,6 @@ # For OS's other than Fedora 18 -- name: Install package python-virtualenv required for KA Lite startup +- name: Install package python-virtualenv allowing KA Lite install into {{ kalite_venv }} package: name: python-virtualenv state: present From 455ebffac03c22c26e3d2c1fabb532d6eba9db8c Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 23 Oct 2019 17:41:39 -0400 Subject: [PATCH 20/22] Ansible 2.7.14 as mandatory min (despite serious flaws in 2.8.3 & 2.8.6 !) --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index c94bb5fec..fe57769e9 100755 --- a/iiab-install +++ b/iiab-install @@ -10,7 +10,7 @@ CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} MIN_RPI_KERN=4.9.59-v7+ -MIN_ANSIBLE_VER=2.8.7 +MIN_ANSIBLE_VER=2.7.14 if [ ! -f /etc/iiab/local_vars.yml ]; then From c4e3ba7eeea1863163547cfae85760ca95b10654 Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 23 Oct 2019 17:49:16 -0400 Subject: [PATCH 21/22] Reminder...to update MIN_RPI_KERN=4.9.59-v7+ soon! --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index fe57769e9..b3d0c3578 100755 --- a/iiab-install +++ b/iiab-install @@ -9,7 +9,7 @@ ARGS="" CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} -MIN_RPI_KERN=4.9.59-v7+ +MIN_RPI_KERN=4.9.59-v7+ # UPDATE THIS SOON...when serious Oct 2019 Raspbian kernel fix (https://github.com/iiab/iiab/issues/1993 etc) is finally mainlined! MIN_ANSIBLE_VER=2.7.14 if [ ! -f /etc/iiab/local_vars.yml ]; then From b7a2fc31f4623b5e2b14cf4b421fa8cdec568ebf Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 23 Oct 2019 17:52:43 -0400 Subject: [PATCH 22/22] Kernel fix verbiage --- iiab-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iiab-install b/iiab-install index b3d0c3578..6b9e0622e 100755 --- a/iiab-install +++ b/iiab-install @@ -9,7 +9,7 @@ ARGS="" CWD=`pwd` OS=`grep ^ID= /etc/*release|cut -d= -f2` OS=${OS//\"/} -MIN_RPI_KERN=4.9.59-v7+ # UPDATE THIS SOON...when serious Oct 2019 Raspbian kernel fix (https://github.com/iiab/iiab/issues/1993 etc) is finally mainlined! +MIN_RPI_KERN=4.9.59-v7+ # UPDATE THIS SOON...when Raspbian's Oct 2019 kernels are finally fixed (https://github.com/iiab/iiab/issues/1993 etc) MIN_ANSIBLE_VER=2.7.14 if [ ! -f /etc/iiab/local_vars.yml ]; then