From 8a1778256e458fa3a04e6218b207a097b91ad4f0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 27 Mar 2018 10:40:20 -0400 Subject: [PATCH 1/6] kiwix-tools 2018-02-26 -> 0.4.0 for armhf & linux64 --- roles/kiwix/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index 26426b5fe..bbcab885f 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -1,6 +1,6 @@ # Which kiwix-tools to download from http://download.iiab.io/packages/ (origin: http://download.kiwix.org/nightly/) -kiwix_src_file_armhf: "kiwix-tools_armhf-2018-02-26.tar.gz" -kiwix_src_file_linux64: "kiwix-tools_linux64-2018-02-26.tar.gz" +kiwix_src_file_armhf: "kiwix-tools_armhf-0.4.0.tar.gz" +kiwix_src_file_linux64: "kiwix-tools_linux64-0.4.0.tar.gz" kiwix_src_file_i686: "kiwix-0.10-linux-i686.tar.bz2" # Published Oct 2016 ("experimental") # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2" # Published May 2014 ("use v0.9 to test legacy ZIM content") # KIWIX FOR i686 SHOULD BE REPLACED BEFORE FEB 2018: https://github.com/kiwix/kiwix-build/issues/94 From 93177c59f51044e5912ab24f6fbe8d3463c9e0ce Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 27 Mar 2018 11:48:31 -0400 Subject: [PATCH 2/6] kiwix-tools archives now contain a dir, so 2-stage install: unarchive then copy --- roles/kiwix/defaults/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml index bbcab885f..ac699d427 100644 --- a/roles/kiwix/defaults/main.yml +++ b/roles/kiwix/defaults/main.yml @@ -1,9 +1,14 @@ # Which kiwix-tools to download from http://download.iiab.io/packages/ (origin: http://download.kiwix.org/nightly/) -kiwix_src_file_armhf: "kiwix-tools_armhf-0.4.0.tar.gz" -kiwix_src_file_linux64: "kiwix-tools_linux64-0.4.0.tar.gz" -kiwix_src_file_i686: "kiwix-0.10-linux-i686.tar.bz2" # Published Oct 2016 ("experimental") + +kiwix_version_armhf: "kiwix-tools_armhf-0.4.0" +kiwix_version_linux64: "kiwix-tools_linux64-0.4.0" +kiwix_version_i686: "kiwix-0.10-linux-i686" # Published Oct 2016 ("experimental") # kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2" # Published May 2014 ("use v0.9 to test legacy ZIM content") -# KIWIX FOR i686 SHOULD BE REPLACED BEFORE FEB 2018: https://github.com/kiwix/kiwix-build/issues/94 +# KIWIX FOR i686 SHOULD BE REPLACED IN EARLY 2018: https://github.com/kiwix/kiwix-build/issues/94 + +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_port: 3000 # Expected to be used soon for Kiwix proxy: From bbf1aaa4ca92754e71b9220e509276a9b12a967d Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 27 Mar 2018 11:48:44 -0400 Subject: [PATCH 3/6] kiwix-tools archives now contain a dir, so 2-stage install: unarchive then copy --- roles/kiwix/tasks/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/kiwix/tasks/main.yml b/roles/kiwix/tasks/main.yml index 7658a8df1..b7981ec50 100644 --- a/roles/kiwix/tasks/main.yml +++ b/roles/kiwix/tasks/main.yml @@ -1,19 +1,22 @@ - name: "Set Kiwix filename to d/l: {{ kiwix_src_file_armhf }} (armv6l or armv71)" set_fact: + kiwix_src_dir: "{{ kiwix_version_armhf }}" kiwix_src_file: "{{ kiwix_src_file_armhf }}" - kiwix_src_bin_only: True + #kiwix_src_bin_only: True 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_bin_only: True + #kiwix_src_bin_only: True 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_bin_only: False + #kiwix_src_bin_only: False when: ansible_machine == "i686" # COMMENT OUT LINE ABOVE TO TEST i686 CODE PATH ON X86_64 (WORKS NOV 2017) From 8356917df939bfe1546168daf4a6946fed130baf Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 27 Mar 2018 11:48:56 -0400 Subject: [PATCH 4/6] kiwix-tools archives now contain a dir, so 2-stage install: unarchive then copy --- roles/kiwix/tasks/kiwix_install.yml | 40 +++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml index e1bf5a52f..c92e4a2e2 100644 --- a/roles/kiwix/tasks/kiwix_install.yml +++ b/roles/kiwix/tasks/kiwix_install.yml @@ -60,26 +60,38 @@ # 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 binaries to permanent location (NOT i686) - unarchive: - src: "{{ downloads_dir }}/{{ kiwix_src_file }}" - dest: "{{ kiwix_path }}/bin" - owner: root - group: root - when: kiwix_src_bin_only and kiwix_force_install - -- name: Unarchive kiwix*i686.tar.bz2 to /tmp (i686) +- name: Unarchive kiwix-tools .tar.gz or .tar.bz2 to /tmp unarchive: src: "{{ downloads_dir }}/{{ kiwix_src_file }}" dest: /tmp - # dest: "{{ iiab_base }}" owner: root group: root - when: not kiwix_src_bin_only and kiwix_force_install + when: kiwix_force_install -- name: Move /tmp/kiwix*i686/bin/* to permanent location /opt/iiab/kiwix/bin (i686) - shell: "mv /tmp/kiwix*i686/bin/* {{ kiwix_path }}/bin/" - when: not kiwix_src_bin_only and kiwix_force_install +- name: Move /tmp/{{ kiwix_src_dir }}/bin/* to permanent location /opt/iiab/kiwix/bin + shell: "mv /tmp/{{ kiwix_src_dir }}/bin/* {{ kiwix_path }}/bin/" + when: kiwix_force_install + +#- name: Unarchive Kiwix binaries to permanent location (NOT i686) +# unarchive: +# src: "{{ downloads_dir }}/{{ kiwix_src_file }}" +# dest: "{{ kiwix_path }}/bin" +# owner: root +# group: root +# when: kiwix_src_bin_only and kiwix_force_install + +#- name: Unarchive kiwix*i686.tar.bz2 to /tmp (i686) +# unarchive: +# src: "{{ downloads_dir }}/{{ kiwix_src_file }}" +# dest: /tmp +# # dest: "{{ iiab_base }}" +# owner: root +# group: root +# when: not kiwix_src_bin_only and kiwix_force_install +# +#- name: Move /tmp/kiwix*i686/bin/* to permanent location /opt/iiab/kiwix/bin (i686) +# shell: "mv /tmp/kiwix*i686/bin/* {{ kiwix_path }}/bin/" +# when: not kiwix_src_bin_only and kiwix_force_install # 3. ENABLE MODS FOR APACHE PROXY IF DEBUNTU From 60e5323b58eb825ef3213ebe362c62f83dfe5144 Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 27 Mar 2018 12:02:47 -0400 Subject: [PATCH 5/6] new kiwix-tools archives contain named/versioned-dir but not bin --- 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 b7981ec50..673ef7ef9 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_bin_only: True + 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_bin_only: True + 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_bin_only: False + 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 d1d645ba59edbc504198b583ec477b840123042e Mon Sep 17 00:00:00 2001 From: A Holt Date: Tue, 27 Mar 2018 12:02:58 -0400 Subject: [PATCH 6/6] new kiwix-tools archives contain named/versioned-dir but not bin --- roles/kiwix/tasks/kiwix_install.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml index c92e4a2e2..f08b9a7f2 100644 --- a/roles/kiwix/tasks/kiwix_install.yml +++ b/roles/kiwix/tasks/kiwix_install.yml @@ -68,9 +68,13 @@ group: root when: kiwix_force_install -- name: Move /tmp/{{ kiwix_src_dir }}/bin/* to permanent location /opt/iiab/kiwix/bin +- name: Move /tmp/{{ kiwix_src_dir }}/* to permanent location /opt/iiab/kiwix/bin (armhf & linux64) + shell: "mv /tmp/{{ kiwix_src_dir }}/* {{ kiwix_path }}/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 + when: kiwix_force_install and kiwix_src_contains_bin #- name: Unarchive Kiwix binaries to permanent location (NOT i686) # unarchive: