From 42657c6bbf59ccef0e25a5e9561b2c848c91ab68 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 26 Nov 2017 11:29:56 -0500
Subject: [PATCH] Update kiwix_install.yml

---
 roles/kiwix/tasks/kiwix_install.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml
index fb8309bf1..106f9c6cb 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/kiwix_install.yml
@@ -7,7 +7,7 @@
     state: directory
   with_items:
   - "{{ iiab_zim_path }}"
-  - "{{ kiwix_content_path }}"
+  - "{{ iiab_zim_path }}/content"
   - "{{ iiab_zim_path }}/index"
 
 - name: Check for /library/zims/library.xml
@@ -103,10 +103,13 @@
   - rewrite
   when: is_debuntu
 
-# workaround because kiwix-serve does not stay running
+# In the past kiwix-serve did not stay running, so we'd been doing this hourly.
+# @mgautierfr & others suggest kiwix-serve might be auto-restarted w/o cron in
+# future, whenever service fails, if this really catches all cases?
+# https://github.com/iiab/iiab/issues/484#issuecomment-342151726
 - name: Make a crontab entry to restart kiwix-serve at 4AM (debuntu)
-# *  *  *  *  * user-name  command to be executed
   lineinfile:
+         # m  h  d  m  day-of-week[Sunday=0] username command-to-be-executed
     line: "0  4  *  *  * root /bin/systemctl restart kiwix-serve.service"
     dest: /etc/crontab
   when: is_debuntu
@@ -171,7 +174,8 @@
     value: "{{ iiab_zim_path }}"
   - option: kiwix_library_xml
     value: "{{ kiwix_library_xml }}"
-  - option: kiwix_content_path
-    value: "{{ kiwix_content_path }}"
+# The following 2 lines are unused as of Nov 2017:
+#   - option: kiwix_content_path
+#     value: "{{ kiwix_content_path }}"
   - option: enabled
     value: "{{ kiwix_enabled }}"