From b042bb4c00bbc93da27c7dda56ce6776515c7a26 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Tue, 1 Oct 2019 20:45:46 -0400
Subject: [PATCH 1/3] /etc/kolibri/daemon.conf forces Kolibri installer to
 populate /library/kolibri (hopefully no need to run "kolibri manage migrate"
 !)

---
 roles/kolibri/tasks/main.yml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index c8c0dab67..c7a18eb30 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -32,6 +32,14 @@
     owner: root
     group: root
     mode: 0644
+    
+- name: Save kolibri_home (KOLIBRI_HOME="{{ kolibri_home }}") to /etc/kolibri/daemon.conf
+  copy:
+    content: 'KOLIBRI_HOME="{{ kolibri_home }}"'
+    dest: /etc/kolibri/daemon.conf
+    owner: root
+    group: root
+    mode: 0644
 
 - name: apt install latest Kolibri .deb from {{ kolibri_deb_url }}
   apt:
@@ -60,14 +68,16 @@
     state: stopped
 
 
-- name: Run Kolibri migrations to begin populating {{ kolibri_home }}    # i.e. /library/kolibri
-  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" manage migrate
-  ignore_errors: yes
-  become: yes
-  become_user: "{{ kolibri_user }}"
-  when: kolibri_provision | bool
+# 2019-10-01: Should no longer be nec, thanks to /etc/kolibri/daemon.conf
+#             containing KOLIBRI_HOME="/library/kolibri" (above)
+#- name: Run Kolibri migrations to begin populating {{ kolibri_home }}    # i.e. /library/kolibri
+#  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" manage migrate
+#  ignore_errors: yes
+#  become: yes
+#  become_user: "{{ kolibri_user }}"
+#  when: kolibri_provision | bool
 
-- name: Set Kolibri default language
+- name: Set Kolibri default language ({{ kolibri_language }})
   shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
   ignore_errors: yes
   become: yes
@@ -79,7 +89,8 @@
     export KOLIBRI_HOME="{{ kolibri_home }}" &&
     "{{ kolibri_exec_path }}" manage provisiondevice --facility "{{ kolibri_facility }}"
     --superusername "{{ kolibri_admin_user }}" --superuserpassword "{{ kolibri_admin_password }}"
-    --preset "{{ kolibri_preset }}" --language_id "{{ kolibri_language }}" --verbosity 0 --noinput
+    --preset "{{ kolibri_preset }}" --language_id "{{ kolibri_language }}"
+    #--preset "{{ kolibri_preset }}" --language_id "{{ kolibri_language }}" --verbosity 0 --noinput
   ignore_errors: yes
   become: yes
   become_user: "{{ kolibri_user }}"

From 040a5c2c8f866d5421d422b231b15f4442fb9760 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 6 Oct 2019 20:53:40 -0400
Subject: [PATCH 2/3] Explain Kolibri provisioning, per @benjaoming rec

---
 roles/kolibri/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index c7a18eb30..d951b112b 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -84,7 +84,7 @@
   become_user: "{{ kolibri_user }}"
   when: kolibri_provision | bool
 
-- name: Set Kolibri facility name, admin acnt / password, preset type, and language
+- name: Provision Kolibri, while setting: facility name, admin acnt / password, preset type, and language
   shell: >
     export KOLIBRI_HOME="{{ kolibri_home }}" &&
     "{{ kolibri_exec_path }}" manage provisiondevice --facility "{{ kolibri_facility }}"

From efda27304071c54c64d31e957cce5a52b93ab346 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sun, 6 Oct 2019 21:04:40 -0400
Subject: [PATCH 3/3] Ansible requires quotes around ':' in task descriptions

---
 roles/kolibri/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index d951b112b..fd7e2210d 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -84,7 +84,7 @@
   become_user: "{{ kolibri_user }}"
   when: kolibri_provision | bool
 
-- name: Provision Kolibri, while setting: facility name, admin acnt / password, preset type, and language
+- name: 'Provision Kolibri, while setting: facility name, admin acnt / password, preset type, and language'
   shell: >
     export KOLIBRI_HOME="{{ kolibri_home }}" &&
     "{{ kolibri_exec_path }}" manage provisiondevice --facility "{{ kolibri_facility }}"