Merge pull request #93 from iiab/master

sync from iiab/iiab

roles/kiwix/defaults/main.yml

@@ -15,9 +15,8 @@ kiwix_src_file_linux64: "{{ kiwix_version_linux64 }}.tar.gz"
 kiwix_src_file_i686: "{{ kiwix_version_i686 }}.tar.gz"
 
 kiwix_port: 3000
-# Expected to be used soon for Kiwix proxy:
+# Used for Kiwix proxy http://box/kiwix/
 kiwix_url: /kiwix/
-# Unused in Nov 2017, but should be:
 kiwix_path: "{{ iiab_base }}/kiwix"
 
 # /library/zims contains 3 important things:
@@ -26,13 +25,9 @@ kiwix_path: "{{ iiab_base }}/kiwix"
 # - index directory for legacy *.zim.idx's
 iiab_zim_path: "{{ content_base }}/zims"
 kiwix_library_xml: "{{ iiab_zim_path }}/library.xml"
-# Unused: (Nov 2017)
-# kiwix_content_path: "{{ iiab_zim_path }}/content"
 
 # Installation Variables
 kiwix_install: True
 kiwix_enabled: True
 # MOVE FILE /opt/iiab/kiwix/bin/kiwix-serve TO FORCE A REINSTALL OF kiwix-tools
 kiwix_force_install: False
-# Unused: (Nov 2017)
-# kiwix_content_found: False

roles/kiwix/tasks/kiwix_install.yml

@@ -58,9 +58,7 @@
     state: directory
 
 # 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 to /tmp
   unarchive:
     src: "{{ downloads_dir }}/{{ kiwix_src_file }}"
@@ -71,32 +69,7 @@
 
 - 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
-
-#- 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:
-#    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
+  when: kiwix_force_install
 
 # 3. ENABLE MODS FOR APACHE PROXY IF DEBUNTU
 
@@ -194,8 +167,5 @@
     value: "{{ iiab_zim_path }}"
   - option: kiwix_library_xml
     value: "{{ kiwix_library_xml }}"
-# The following 2 lines are unused: (Nov 2017)
-#   - option: kiwix_content_path
-#     value: "{{ kiwix_content_path }}"
   - option: enabled
     value: "{{ kiwix_enabled }}"

roles/kiwix/tasks/main.yml

@@ -2,21 +2,18 @@
   set_fact:
      kiwix_src_dir: "{{ kiwix_version_armhf }}"
      kiwix_src_file: "{{ kiwix_src_file_armhf }}"
-#     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
   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
   when: ansible_machine == "i686"
 # COMMENT OUT LINE ABOVE TO TEST i686 CODE PATH ON X86_64 (WORKS NOV 2017)
 

scripts/ansible

@@ -12,7 +12,7 @@ echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/an
 echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x or scripts/ansible-2.6.x "slow food".\n\n'
 
 
-GOOD_VER="2.6.0"      # Ansible version for OLPC XO laptops (pip install).
+GOOD_VER="2.6.1"      # Ansible version for OLPC XO laptops (pip install).
                       # On other OS's we install/upgrade to THE latest (released version of) Ansible.
 CURR_VER="undefined"
 # below are unused for future use

scripts/ansible-2.5.x

@@ -12,7 +12,7 @@ echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/an
 echo -e 'ALTERNATIVES: Run scripts/ansible-2.6.x, or scripts/ansible for the latest.\n\n'
 
 
-GOOD_VER="2.6.0"      # Ansible version for OLPC XO laptops (pip install).
+GOOD_VER="2.5.6"      # Ansible version for OLPC XO laptops (pip install).
                       # On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.5.x
 CURR_VER="undefined"
 # below are unused for future use

scripts/ansible-2.6.x

@@ -12,7 +12,7 @@ echo -e 'Ensure you'"'"'re online before running this (/opt/iiab/iiab/scripts/an
 echo -e 'ALTERNATIVES: Run scripts/ansible-2.5.x, or scripts/ansible for the latest.\n\n'
 
 
-GOOD_VER="2.6.0"      # Ansible version for OLPC XO laptops (pip install).
+GOOD_VER="2.6.1"      # Ansible version for OLPC XO laptops (pip install).
                       # On other OS's we attempt to install/upgrade/pin to the latest Ansible 2.6.x
 CURR_VER="undefined"
 # below are unused for future use