From 04368ffbe9439af1fad27d5b15a26542aa8365dd Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 19 Mar 2020 05:42:00 -0500 Subject: [PATCH] move Ubermix workaround --- roles/1-prep/tasks/main.yml | 8 ++++++++ roles/kalite/tasks/install.yml | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml index 97dd3fa26..4cdefaa66 100644 --- a/roles/1-prep/tasks/main.yml +++ b/roles/1-prep/tasks/main.yml @@ -62,6 +62,14 @@ when: grep_ubermix.rc == 0 # 1 if absent in file, 2 if file doesn't exist #when: ro_dir.stat.exists +# This effectively does nothing at all on Ubuntu & Raspbian, where libgeos-* +# pkgs are not installed FWIW. But it's included to safeguard us across all +# OS's, in case others OS's like Ubermix later appear. See #1382 for details. +# Removing pkgs libgeos-3.6.2 & libgeos-c1v5 fixed the situation on Ubermix! +- name: Remove libgeos-* pkgs, avoiding KA Lite Django failure on Ubermix + shell: apt -y remove "libgeos-*" + when: grep_ubermix.rc == 0 # 1 if absent in file, 2 if file doesn't exist + - name: SSHD include_role: name: sshd diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 5c2bfa2af..24f5f354b 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -23,13 +23,6 @@ #extra_args="--disable-pip-version-check" when: internet_available | bool -# This effectively does nothing at all on Ubuntu & Raspbian, where libgeos-* -# pkgs are not installed FWIW. But it's included to safeguard us across all -# OS's, in case others OS's like Ubermix later appear. See #1382 for details. -# Removing pkgs libgeos-3.6.2 & libgeos-c1v5 fixed the situation on Ubermix! -- name: Remove libgeos-* pkgs, avoiding KA Lite Django failure on Ubermix - shell: apt -y remove "libgeos-*" - - name: "Install from template: venv wrapper /usr/bin/kalite, systemd unit file kalite-serve.service, Apache's kalite.conf" template: backup: no