From cd112cd8c32e635c543bc4b145b7e9884c92ae3e Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 2 Jul 2018 08:01:28 -0400
Subject: [PATCH 1/3] Update main.yml

---
 roles/kiwix/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml
index 4e3fe36ae..04a8c291b 100644
--- a/roles/kiwix/defaults/main.yml
+++ b/roles/kiwix/defaults/main.yml
@@ -12,7 +12,7 @@ kiwix_version_i686: "kiwix-tools_linux-x86_64-0.6.0"
 
 kiwix_src_file_armhf: "{{ kiwix_version_armhf }}.tar.gz"
 kiwix_src_file_linux64: "{{ kiwix_version_linux64 }}.tar.gz"
-kiwix_src_file_i686: "{{ kiwix_version_i686 }}.tar.bz2"
+kiwix_src_file_i686: "{{ kiwix_version_i686 }}.tar.gz"
 
 kiwix_port: 3000
 # Expected to be used soon for Kiwix proxy:

From 80c9d62e438413f8674086023405dd8cfd4d0b35 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 2 Jul 2018 08:24:27 -0400
Subject: [PATCH 2/3] Update main.yml

---
 roles/kiwix/tasks/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/kiwix/tasks/main.yml b/roles/kiwix/tasks/main.yml
index 673ef7ef9..b80baa656 100644
--- a/roles/kiwix/tasks/main.yml
+++ b/roles/kiwix/tasks/main.yml
@@ -2,21 +2,21 @@
   set_fact:
      kiwix_src_dir: "{{ kiwix_version_armhf }}"
      kiwix_src_file: "{{ kiwix_src_file_armhf }}"
-     kiwix_src_contains_bin: False
+#     kiwix_src_contains_bin: False
   when: ansible_machine == "armv7l" or ansible_machine == "armv6l"
   
 - name: "Set Kiwix filename to d/l: {{ kiwix_src_file_linux64 }} (x86_64)"
   set_fact:
      kiwix_src_dir: "{{ kiwix_version_linux64 }}"
      kiwix_src_file: "{{ kiwix_src_file_linux64 }}"
-     kiwix_src_contains_bin: False
+#     kiwix_src_contains_bin: False
   when: ansible_machine == "x86_64"
 
 - name: "Set Kiwix filename to d/l: {{ kiwix_src_file_i686 }} (i686)"
   set_fact:
      kiwix_src_dir: "{{ kiwix_version_i686 }}"
      kiwix_src_file: "{{ kiwix_src_file_i686 }}"
-     kiwix_src_contains_bin: True
+#     kiwix_src_contains_bin: True
   when: ansible_machine == "i686"
 # COMMENT OUT LINE ABOVE TO TEST i686 CODE PATH ON X86_64 (WORKS NOV 2017)
 

From 1b612521f9a25da0428dfc7b8cf1931ce5971ad0 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Mon, 2 Jul 2018 08:26:26 -0400
Subject: [PATCH 3/3] Update kiwix_install.yml

---
 roles/kiwix/tasks/kiwix_install.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml
index f08b9a7f2..956812ac7 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/kiwix_install.yml
@@ -60,7 +60,8 @@
 # 2. INSTALL KIWIX-TOOLS EXECUTABLES IF kiwix_force_install
 # (We get a whole web server for i686 but only kiwix execs for linux64 & armhf)
 
-- name: Unarchive kiwix-tools .tar.gz or .tar.bz2 to /tmp
+#- name: Unarchive kiwix-tools .tar.gz or .tar.bz2 to /tmp
+- name: Unarchive kiwix-tools .tar.gz to /tmp
   unarchive:
     src: "{{ downloads_dir }}/{{ kiwix_src_file }}"
     dest: /tmp
@@ -68,13 +69,13 @@
     group: root
   when: kiwix_force_install
 
-- name: Move /tmp/{{ kiwix_src_dir }}/* to permanent location /opt/iiab/kiwix/bin (armhf & linux64)
+- name: Move /tmp/{{ kiwix_src_dir }}/* to permanent location /opt/iiab/kiwix/bin (armhf & linux64 & i686)
   shell: "mv /tmp/{{ kiwix_src_dir }}/* {{ kiwix_path }}/bin/"
-  when: kiwix_force_install and not kiwix_src_contains_bin
+#  when: kiwix_force_install and not kiwix_src_contains_bin
 
-- name: Move /tmp/{{ kiwix_src_dir }}/bin/* to permanent location /opt/iiab/kiwix/bin (i686)
-  shell: "mv /tmp/{{ kiwix_src_dir }}/bin/* {{ kiwix_path }}/bin/"
-  when: kiwix_force_install and kiwix_src_contains_bin
+#- name: Move /tmp/{{ kiwix_src_dir }}/bin/* to permanent location /opt/iiab/kiwix/bin (i686)
+#  shell: "mv /tmp/{{ kiwix_src_dir }}/bin/* {{ kiwix_path }}/bin/"
+#  when: kiwix_force_install and kiwix_src_contains_bin
 
 #- name: Unarchive Kiwix binaries to permanent location (NOT i686)
 #  unarchive: