Update kiwix_install.yml

roles/kiwix/tasks/kiwix_install.yml

@@ -8,9 +8,9 @@
     mode: 0755
     state: directory
   with_items:
-  - "{{ iiab_zim_path }}"
-  - "{{ iiab_zim_path }}/content"
-  - "{{ iiab_zim_path }}/index"
+    - "{{ iiab_zim_path }}"
+    - "{{ iiab_zim_path }}/content"
+    - "{{ iiab_zim_path }}/index"
 
 - name: Check for {{ kiwix_library_xml }}    # /library/zims/library.xml
   stat:
@@ -19,14 +19,12 @@
 
 - name: Install a stub /library/zims/library.xml if one doesn't exist
   template:
-    src: "{{ item }}"
+    src: library.xml
     dest: "{{ kiwix_library_xml }}"
     mode: 0644
     owner: root
     group: root
     force: no
-  with_items:
-  - library.xml
   when: not kiwix_xml.stat.exists
 
 - name: Check for /opt/iiab/kiwix/bin/kiwix-serve binary
@@ -73,14 +71,15 @@
 
 # 3. ENABLE MODS FOR APACHE PROXY IF DEBUNTU
 
+# 2019-09-29: compare roles/kolibri/defaults/main.yml using just 1 (proxy_http)
 - name: Enable the 4 mods which permit Apache to proxy (debuntu)
   apache2_module:
     name: "{{ item }}"
   with_items:
-  - proxy
-  - proxy_html
-  - proxy_http
-  - rewrite
+    - proxy
+    - proxy_html
+    - proxy_http
+    - rewrite
   when: is_debuntu | bool
 
 # 4. CREATE/ENABLE/RESTART (OR DISABLE) KIWIX SERVICE & ITS CRON JOB
@@ -94,12 +93,10 @@
     group: root
     mode: "{{ item.mode }}"
   with_items:
-  - { src: 'kiwix-serve.service.j2', dest: '/etc/systemd/system/kiwix-serve.service', mode: '0644'}
-#   - { src: 'kiwix-serve-init.j2', dest: '/usr/libexec/kiwix-serve-init', mode: '0755'}
-  - { src: 'iiab-make-kiwix-lib', dest: '/usr/bin/iiab-make-kiwix-lib', mode: '0755'}
-  - { src: 'iiab-make-kiwix-lib.py', dest: '/usr/bin/iiab-make-kiwix-lib.py', mode: '0755'}
-#  - { src: 'iiab-make-apache-config.py', dest: '/usr/bin/iiab-make-apache-config.py', mode: '0755'}
-  - { src: 'kiwix.conf.j2', dest: '/etc/{{ apache_config_dir }}/kiwix.conf', mode: '0644'}
+    - { src: 'kiwix-serve.service.j2', dest: '/etc/systemd/system/kiwix-serve.service', mode: '0644'}
+    - { src: 'iiab-make-kiwix-lib', dest: '/usr/bin/iiab-make-kiwix-lib', mode: '0755'}
+    - { src: 'iiab-make-kiwix-lib.py', dest: '/usr/bin/iiab-make-kiwix-lib.py', mode: '0755'}
+    - { src: 'kiwix.conf.j2', dest: '/etc/{{ apache_config_dir }}/kiwix.conf', mode: '0644'}
 
 - name: Create softlink kiwix.conf from sites-enabled to sites-available - for Kiwix Proxy in Apache - is disabled by turning off service kiwix-serve (debuntu)
   file:
@@ -157,19 +154,19 @@
     option: "{{ item.option }}"
     value: "{{ item.value }}"
   with_items:
-  - option: name
-    value: Kiwix
-  - option: description
-    value: '"Part of https://github.com/kiwix/kiwix-tools/ - kiwix-serve is the most used web server for ZIM files."'
-  - option: kiwix_url
-    value: "{{ kiwix_url }}"
-  - option: kiwix_path
-    value: "{{ kiwix_path }}"
-  - option: kiwix_port
-    value: "{{ kiwix_port }}"
-  - option: iiab_zim_path
-    value: "{{ iiab_zim_path }}"
-  - option: kiwix_library_xml
-    value: "{{ kiwix_library_xml }}"
-  - option: kiwix_enabled
-    value: "{{ kiwix_enabled }}"
+    - option: name
+      value: Kiwix
+    - option: description
+      value: '"Part of https://github.com/kiwix/kiwix-tools/ - kiwix-serve is the most used web server for ZIM files."'
+    - option: kiwix_url
+      value: "{{ kiwix_url }}"
+    - option: kiwix_path
+      value: "{{ kiwix_path }}"
+    - option: kiwix_port
+      value: "{{ kiwix_port }}"
+    - option: iiab_zim_path
+      value: "{{ iiab_zim_path }}"
+    - option: kiwix_library_xml
+      value: "{{ kiwix_library_xml }}"
+    - option: kiwix_enabled
+      value: "{{ kiwix_enabled }}"