From 43c3ef4ddfe83e85090b949ed63958ec9cb7e3a5 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 31 Aug 2022 22:54:24 -0400 Subject: [PATCH 1/4] kolibri/tasks/install.yml: Modern apt keyring approach --- roles/kolibri/tasks/install.yml | 45 +++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml index 4323f0932..b519c95e1 100644 --- a/roles/kolibri/tasks/install.yml +++ b/roles/kolibri/tasks/install.yml @@ -44,11 +44,30 @@ # https://kolibri.readthedocs.io/en/latest/install/ubuntu-debian.html says: # "When you use the PPA installation method, upgrades to newer versions # will be automatic, provided there is internet access available." + # + # IN REALITY: Kolibri upgrades are still tricky, as 3 pink screens prompt you + # and PEOPLE WON'T KNOW TO TYPE IN things like Linux username 'kolibri' :/ - - name: Add Kolibri PPA repo 'ppa:learningequality/kolibri' (if is_ubuntu and not is_linuxmint) + # 2022-08-31: keyring /etc/apt/trusted.gpg DEPRECATED as detailed on #3343 + - name: Download Kolibri's apt key to /usr/share/keyrings/learningequality-kolibri.gpg + shell: | + gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys DC5BAA93F9E4AE4F0411F97C74F88ADB3194DD81 + gpg --yes --output /usr/share/keyrings/learningequality-kolibri.gpg --export DC5BAA93F9E4AE4F0411F97C74F88ADB3194DD81 + + - name: Add signed Kolibri PPA 'jammy' (if Ubuntu 22.04 or 22.10 or Mint 21 or Debian 12) apt_repository: - repo: ppa:learningequality/kolibri - when: is_ubuntu and not is_linuxmint + repo: "deb [signed-by=/usr/share/keyrings/learningequality-kolibri.gpg] http://ppa.launchpad.net/learningequality/kolibri/ubuntu jammy main" + when: is_ubuntu_2204 or is_ubuntu_2210 or is_debian_12 # MINT 21 COVERED BY is_ubuntu_2204 + + - name: Add signed Kolibri PPA 'focal' (other OS's) + apt_repository: + repo: "deb [signed-by=/usr/share/keyrings/learningequality-kolibri.gpg] http://ppa.launchpad.net/learningequality/kolibri/ubuntu focal main" + when: not (is_ubuntu_2204 or is_ubuntu_2210 or is_debian_12) + + # - name: Add Kolibri PPA repo 'ppa:learningequality/kolibri' (if is_ubuntu and not is_linuxmint) + # apt_repository: + # repo: ppa:learningequality/kolibri + # when: is_ubuntu and not is_linuxmint # 2022-08-19: 'add-apt-repository ppa:learningequality/kolibri' works at CLI on # Mint 21 (creating /etc/apt/sources.list.d/learningequality-kolibri-jammy.list) @@ -66,17 +85,17 @@ # 2022-08-19: 'apt-key list' & 'apt-key del 3194 DD81' are useful if you also # want to clear out Kolibri's key from the DEPRECATED /etc/apt/trusted.gpg - - name: Add Kolibri PPA repo 'ppa:learningequality/kolibri' with codename 'jammy' (if is_linuxmint_21) - apt_repository: - repo: ppa:learningequality/kolibri - codename: jammy # CONSOLIDATE THIS SPECIAL CASE STANZA WITH UBUNTU ABOVE IN FUTURE? - when: is_linuxmint_21 + # - name: Add Kolibri PPA repo 'ppa:learningequality/kolibri' with codename 'jammy' (if is_linuxmint_21) + # apt_repository: + # repo: ppa:learningequality/kolibri + # codename: jammy # CONSOLIDATE THIS SPECIAL CASE STANZA WITH UBUNTU ABOVE IN FUTURE? + # when: is_linuxmint_21 - - name: Add Kolibri PPA repo 'ppa:learningequality/kolibri' with codename 'focal' (if is_debian or is_linuxmint_20) - apt_repository: - repo: ppa:learningequality/kolibri - codename: focal # UPDATE THIS TO 'jammy' AFTER "RasPiOS Bookworm" (based on Debian 12) IS RELEASED! (ETA Q3 2023) - when: is_debian or is_linuxmint_20 + # - name: Add Kolibri PPA repo 'ppa:learningequality/kolibri' with codename 'focal' (if is_debian or is_linuxmint_20) + # apt_repository: + # repo: ppa:learningequality/kolibri + # codename: focal # UPDATE THIS TO 'jammy' AFTER "RasPiOS Bookworm" (based on Debian 12) IS RELEASED! (ETA Q3 2023) + # when: is_debian or is_linuxmint_20 - name: apt install kolibri (populates {{ kolibri_home }}, migrates database) # i.e. /library/kolibri apt: From 55b0239ccbf038224ae1478fbb2d34a43ac1fd46 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Sep 2022 00:28:32 -0400 Subject: [PATCH 2/4] Document that apt upgrading Kolibri is risky (for now!) --- roles/kolibri/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml index b519c95e1..f0311fabb 100644 --- a/roles/kolibri/tasks/install.yml +++ b/roles/kolibri/tasks/install.yml @@ -45,8 +45,8 @@ # "When you use the PPA installation method, upgrades to newer versions # will be automatic, provided there is internet access available." # - # IN REALITY: Kolibri upgrades are still tricky, as 3 pink screens prompt you - # and PEOPLE WON'T KNOW TO TYPE IN things like Linux username 'kolibri' :/ + # IN REALITY: apt upgrading Kolibri is risky, as 3 pink/blue screens prompt + # PPL WHO DON'T KNOW TO TYPE IN things like Linux username 'kolibri' :/ #3356 # 2022-08-31: keyring /etc/apt/trusted.gpg DEPRECATED as detailed on #3343 - name: Download Kolibri's apt key to /usr/share/keyrings/learningequality-kolibri.gpg From a6f89e59a42f0e5d42e4b4d8fdcc11b7782b31fe Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Sep 2022 00:31:05 -0400 Subject: [PATCH 3/4] kolibri/tasks/install.yml: PPA 'focal' (other/older OS's) --- roles/kolibri/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml index f0311fabb..191cba125 100644 --- a/roles/kolibri/tasks/install.yml +++ b/roles/kolibri/tasks/install.yml @@ -59,7 +59,7 @@ repo: "deb [signed-by=/usr/share/keyrings/learningequality-kolibri.gpg] http://ppa.launchpad.net/learningequality/kolibri/ubuntu jammy main" when: is_ubuntu_2204 or is_ubuntu_2210 or is_debian_12 # MINT 21 COVERED BY is_ubuntu_2204 - - name: Add signed Kolibri PPA 'focal' (other OS's) + - name: Add signed Kolibri PPA 'focal' (other/older OS's) apt_repository: repo: "deb [signed-by=/usr/share/keyrings/learningequality-kolibri.gpg] http://ppa.launchpad.net/learningequality/kolibri/ubuntu focal main" when: not (is_ubuntu_2204 or is_ubuntu_2210 or is_debian_12) From bffe5227a05348e773ddd868b2177d03b87f4662 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 1 Sep 2022 00:33:04 -0400 Subject: [PATCH 4/4] kolibri/tasks/install.yml: Clarify 'focal' (if other/older OS's) --- roles/kolibri/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kolibri/tasks/install.yml b/roles/kolibri/tasks/install.yml index 191cba125..91d347701 100644 --- a/roles/kolibri/tasks/install.yml +++ b/roles/kolibri/tasks/install.yml @@ -59,7 +59,7 @@ repo: "deb [signed-by=/usr/share/keyrings/learningequality-kolibri.gpg] http://ppa.launchpad.net/learningequality/kolibri/ubuntu jammy main" when: is_ubuntu_2204 or is_ubuntu_2210 or is_debian_12 # MINT 21 COVERED BY is_ubuntu_2204 - - name: Add signed Kolibri PPA 'focal' (other/older OS's) + - name: Add signed Kolibri PPA 'focal' (if other/older OS's) apt_repository: repo: "deb [signed-by=/usr/share/keyrings/learningequality-kolibri.gpg] http://ppa.launchpad.net/learningequality/kolibri/ubuntu focal main" when: not (is_ubuntu_2204 or is_ubuntu_2210 or is_debian_12)