From b2674391365f67e1eb37ee86ef848084e679986b Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 11 Jan 2020 12:38:37 -0500
Subject: [PATCH] Update and rename kiwix_install.yml to install.yml

---
 .../tasks/{kiwix_install.yml => install.yml}  | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)
 rename roles/kiwix/tasks/{kiwix_install.yml => install.yml} (75%)

diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/install.yml
similarity index 75%
rename from roles/kiwix/tasks/kiwix_install.yml
rename to roles/kiwix/tasks/install.yml
index 1d9ae4c8b..defce47e0 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/install.yml
@@ -1,4 +1,5 @@
 # 1. CREATE/VERIFY CRITICAL DIRECTORIES & FILES ARE IN PLACE
+
 - name: Download Kiwix software to /opt/iiab/downloads
   get_url:
     url: "{{ iiab_download_url }}/{{ kiwix_src_file }}"
@@ -14,9 +15,9 @@
 - name: Create directory {{ iiab_zim_path }} and subdirs {content, index} for Kiwix ZIM files
   file:
     path: "{{ item }}"
-    owner: root
-    group: root
-    mode: 0755
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0755'    # Not nec? Remove?
     state: directory
   with_items:
     - "{{ iiab_zim_path }}"
@@ -28,47 +29,44 @@
     path: "{{ kiwix_library_xml }}"
   register: kiwix_xml
 
-- name: Install a stub /library/zims/library.xml if one doesn't exist
+- name: Install stub /library/zims/library.xml from template, if one doesn't exist
   template:
     src: library.xml
     dest: "{{ kiwix_library_xml }}"
-    mode: 0644
-    owner: root
-    group: root
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
     force: no
   when: not kiwix_xml.stat.exists
 
-- name: Install {{ iiab_zim_path }}/content/test.zim if kiwix_force_install
+- name: Install {{ iiab_zim_path }}/content/test.zim
   copy:
     src: test.zim
     dest: "{{ iiab_zim_path }}/content/test.zim"
-    mode: 0644
-    owner: root
-    group: root
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0644'    # Not nec? Remove?
     force: no
-  when: kiwix_force_install | bool
 
 - name: Create {{ kiwix_path }}/bin directory    # /opt/iiab/kiwix/bin
   file:
     path: "{{ kiwix_path }}/bin"
-    owner: root
-    group: root
-    mode: 0755
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
+    mode: '0755'    # Not nec? Remove?
     state: directory
 
-# 2. INSTALL KIWIX-TOOLS EXECUTABLES IF kiwix_force_install
+# 2. INSTALL KIWIX-TOOLS EXECUTABLES
 
 - name: Unarchive {{ kiwix_src_file }} to /tmp    # e.g. kiwix-tools_linux-armhf-0.6.1-1.tar.gz
   unarchive:
     src: "{{ downloads_dir }}/{{ kiwix_src_file }}"
     dest: /tmp
-    owner: root
-    group: root
-  when: kiwix_force_install | bool
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
 
 - 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 | bool
 
 # 3. ENABLE MODS FOR APACHE PROXY IF DEBUNTU
 
@@ -84,15 +82,14 @@
 #    - rewrite
 #  when: is_debuntu | bool
 
-# 4. CREATE/ENABLE/RESTART (OR DISABLE) KIWIX SERVICE & ITS CRON JOB
+# 4. INSTALL iiab-make-kiwix-lib*, kiwix-serve.service, kiwix.conf for Apache
 
 - name: 'Install from templates: kiwix-serve.service, iiab-make-kiwix-lib, iiab-make-kiwix-lib.py, kiwix.conf'
   template:
-    backup: no
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
-    owner: root
-    group: root
+    owner: root    # Not nec? Remove?
+    group: root    # Not nec? Remove?
     mode: "{{ item.mode }}"
   with_items:
     - { src: 'kiwix-serve.service.j2', dest: '/etc/systemd/system/kiwix-serve.service', mode: '0644'}
@@ -100,6 +97,8 @@
     - { src: 'iiab-make-kiwix-lib3.py', dest: '/usr/bin/iiab-make-kiwix-lib.py', mode: '0755'}
     - { src: 'kiwix.conf.j2', dest: '/etc/{{ apache_config_dir }}/kiwix.conf', mode: '0644'}
 
+5. RECORD KIWIX AS INSTALLED
+
 - name: Add 'kiwix_installed' variable values to {{ iiab_state_file }}
   lineinfile:
     dest: "{{ iiab_state_file }}"