From 1641b22165371eed37fba725b03a017422ddf36a Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 26 Sep 2019 18:50:33 -0400 Subject: [PATCH] Install Kolibri w/ apt (.deb file) instead of pip (.pex file) --- roles/kolibri/tasks/main.yml | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index 5021a4492..720c6e393 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -20,24 +20,37 @@ - "{{ kolibri_home }}" # /library/kolibri - "{{ kolibri_venv_path }}" # /usr/local/kolibri -- name: Install latest Kolibri using pip, to venv - pip: +- name: Install latest Kolibri using apt + apt: name: kolibri - virtualenv: "{{ kolibri_venv_path }}" - virtualenv_site_packages: no state: latest extra_args: --no-cache-dir - when: internet_available and not (kolibri_version is defined) + when: internet_available and (kolibri_version is undefined) -- name: Install Kolibri {{ kolibri_version }} using pip, to venv - pip: - name: kolibri - virtualenv: "{{ kolibri_venv_path }}" - virtualenv_site_packages: no - version: "{{ kolibri_version }}" +- name: Install Kolibri {{ kolibri_version }} using apt + apt: + name: "kolibri={{ kolibri_version }}" extra_args: --no-cache-dir when: internet_available and kolibri_version is defined +#- name: Install latest Kolibri using pip, to venv +# pip: +# name: kolibri +# virtualenv: "{{ kolibri_venv_path }}" +# virtualenv_site_packages: no +# state: latest +# extra_args: --no-cache-dir +# when: internet_available and (kolibri_version is undefined) + +#- name: Install Kolibri {{ kolibri_version }} using pip, to venv +# pip: +# name: kolibri +# virtualenv: "{{ kolibri_venv_path }}" +# virtualenv_site_packages: no +# version: "{{ kolibri_version }}" +# extra_args: --no-cache-dir +# when: internet_available and kolibri_version is defined + - name: 'Install from templates: kolibri.service unit file for systemd & sites-available/kolibri.conf for Apache' template: src: "{{ item.src }}"