From e573424ad0f3527931b0eabdfb82074c3b0f50ef Mon Sep 17 00:00:00 2001
From: Aidan Fitzgerald <duckjr159@gmail.com>
Date: Thu, 12 Jul 2018 22:44:10 -0400
Subject: [PATCH] Using PyPI

---
 roles/lokole/defaults/main.yml |  3 ---
 roles/lokole/tasks/install.yml | 47 ++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml
index 39807d87c..245b2b1c2 100644
--- a/roles/lokole/defaults/main.yml
+++ b/roles/lokole/defaults/main.yml
@@ -1,8 +1,5 @@
 lokole_version: "0.1.24"
 
-lokole_download_base_url: "https://github.com/ascoderu/opwen-webapp/archive/"
-lokole_src: "{{ lokole_version }}.tar.gz"
-
 lokole_db_name: iiab_lokole
 lokole_db_user: iiab_lokole_user
 lokole_db_user_password: changeme
diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml
index c08f12416..722774509 100644
--- a/roles/lokole/tasks/install.yml
+++ b/roles/lokole/tasks/install.yml
@@ -3,31 +3,40 @@
     name: "{{ item }}"
     state: present
   with_items:
-    - make
+    - python3
+    - python3-pip
     - python3-venv
-    - npm
-    - shellcheck
+    - python3-dev
+    - libffi-dev
+    - libssl-dev
+    - bcrypt
   tags:
     - download
 
-- name: Download Lokole software, per roles/lokole/defaults/main.yml
-  get_url:
-    url: "{{ lokole_download_base_url }}/{{ lokole_src }}"
-    dest: "{{ downloads_dir }}"
-    timeout: "{{ download_timeout }}"
-#   force: yes
-#   backup: yes
-  register: lokole_download_output
+- name: Install Lokole from PyPI
+  pip:
+    name: opwen_email_client
+    virtualenv: null # TODO figure this out
+  tags:
+    - download
   when: internet_available
 
-- name: Unpack download to permanent location
-  unarchive:
-    src: "{{ downloads_dir }}/{{ lokole_src }}"
-    dest: "{{ lokole_install_path }}"
-    owner: root
-    group: "{{ apache_user }}"
-    mode: 0755
-    keep_newer: yes
+# - name: Download Lokole software, per roles/lokole/defaults/main.yml
+#   git:
+#     repo: "{{ lokole_git_repo }}"
+#     version: "{{ lokole_version }}"
+#     dest: "{{ lokole_install_path }}"
+#   register: lokole_download_output
+#   when: internet_available
+
+# - name: Unpack download to permanent location
+#   unarchive:
+#     src: "{{ downloads_dir }}/{{ lokole_src }}"
+#     dest: "{{  }}"
+#     owner: root
+#     group: "{{ apache_user }}"
+#     mode: 0755
+#     keep_newer: yes
 
 - name: MySQL database needs to be running if we are trying to create a new db
   service: