merge kalite-venv

roles/kalite/defaults/main.yml

@@ -3,6 +3,9 @@
 # To override them edit the main var definitions in iiab/vars
 kalite_version: "0.17.3"
 kalite_repo_url: "https://github.com/learningequality/ka-lite.git"
+kalite_venv: "/usr/local/kalite/venv"
+kalite_program: "{{ kalite_venv }}/bin/kalite"
+kalite_requirements: "https://raw.githubusercontent.com/learningequalit
 kalite_root: "/library/ka-lite"
 kalite_user: kalite
 # obtain a password hash with - python -c 'import crypt; print crypt.crypt("<plaintext>", "$6$<salt>")'

roles/kalite/tasks/install.yml

@@ -4,37 +4,31 @@
   package: name={{ item }}
            state=present
   with_items:
-    - lsb
+    - python-virtualenv
-  when: internet_available  and ansible_distribution == "CentOS"
 
-# Version 0.17.x
+- name: Grap the requirements file
-# pip show kalite
+  get_url: url={{ kalite_requirements }} dest={{ pip_packages_dir }}/kalite.txt
-# Requires: docopt, South, django-js-reverse, ply, slimit, six, django-appconf,
+  when: internet_available 
-# peewee, python-dateutil, django-dbbackup
 
-# from /usr/lib/python2.7/site-packages/ka_lite-0.16.0-py2.7.egg-info/requires.txt
+- name: Download kalite dependencies with pip
-# docopt>=0.6,<0.7
+  pip: requirements={{ pip_packages_dir }}/kalite.txt
-# South==0.8.4
+       extra_args="--disable-pip-version-check --download {{ pip_packages_dir }}"
-# django-js-reverse==0.5.0 ## no rpm
+  when: internet_available 
-# ply==3.4
-# slimit==0.8.1
-# six==1.9.0
-# django-appconf==1.0.1
-# peewee==2.6.3
-# python-dateutil==2.4.2
-# django-dbbackup==2.3.2   ## no rpm
 
-- name: use pip to uninstall setuptools for centos
+- name: Install ka-lite dependencies with pip
-  command: pip uninstall --yes setuptools
+  pip: requirements={{ pip_packages_dir }}/kalite.txt
-  when: ansible_distribution == "CentOS" and not strict_install
+       virtualenv={{ kalite_venv }}
+       virtualenv_site_packages=no
+       extra_args="--disable-pip-version-check"
+  when: internet_available 
 
-- name: Get an unbroken version of setuptools for centos
+- name: Install ka-lite with pip
-  command: pip install setuptools==28.8.0
+  pip: name=ka-lite-static
-  when: ansible_distribution == "CentOS" and not strict_install
+       version={{ kalite_version }}
-
+       virtualenv={{ kalite_venv }}
-- name: Install kalite with pip
+       virtualenv_site_packages=no
-  pip: name=ka-lite version={{ kalite_version }}
+       extra_args="--disable-pip-version-check"
-  when: internet_available
+  when: internet_available 
 
 - name: Default is to have cronserve started with kalite
   set_fact:
@@ -46,7 +40,7 @@
   when: not kalite_cron_enabled
 
 - name: Create kalite service(s) and support scripts
-  template: backup=yes
+  template: backup=no
             src={{ item.src }}
             dest={{ item.dest }}
             owner=root
@@ -56,4 +50,3 @@
     - { src: 'kalite-serve.service.j2', dest: '/etc/systemd/system/kalite-serve.service', mode: '0644'}
     - { src: 'kalite.sh.j2', dest: '/etc/profile.d/kalite.sh', mode: '0644'}
     - { src: 'kalite.conf', dest: '/etc/{{ apache_config_dir}}', mode: '0644'}
-

vars/centos-7.yml

@@ -10,7 +10,6 @@ apache_config_dir: httpd/conf.d
 apache_log_dir: /var/log/httpd
 smb_service: smb
 nmb_service: nmb
-kalite_program: /usr/bin/kalite
 systemctl_program: /usr/bin/systemctl
 mysql_service: mariadb
 apache_log: /var/log/httpd/access_log

vars/debian-8.yml

@@ -11,7 +11,6 @@ apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd
-kalite_program: /usr/local/bin/kalite
 systemctl_program: /bin/systemctl
 mysql_service: mysql
 apache_log: /var/log/apache2/access.log

vars/fedora-18.yml

@@ -9,7 +9,6 @@ apache_config_dir: httpd/conf.d
 apache_log_dir: /var/log/httpd
 smb_service: smb
 nmb_service: nmb
-kalite_program: /usr/bin/kalite
 systemctl_program: /usr/bin/systemctl
 mysql_service: mariadb
 apache_log: /var/log/httpd/access_log

vars/fedora-22.yml

@@ -9,7 +9,6 @@ apache_config_dir: httpd/conf.d
 apache_log_dir: /var/log/httpd
 smb_service: smb
 nmb_service: nmb
-kalite_program: /usr/bin/kalite
 systemctl_program: /usr/bin/systemctl
 mysql_service: mariadb
 apache_log: /var/log/httpd/access_log

vars/raspbian-8.yml

@@ -13,7 +13,6 @@ apache_user: www-data
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd
-kalite_program: /usr/local/bin/kalite
 systemctl_program: /bin/systemctl
 mysql_service: mysql
 apache_log: /var/log/apache2/access.log

vars/ubuntu-16.yml

@@ -10,7 +10,6 @@ apache_config_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
 smb_service: smbd
 nmb_service: nmbd
-kalite_program: /usr/local/bin/kalite
 systemctl_program: /bin/systemctl
 mysql_service: mysql
 apache_log: /var/log/apache2/access.log