From e1e0f8ce537f33b4c4f6ef0fd7789e40974d6afb Mon Sep 17 00:00:00 2001
From: Arky <hitmanarky@gmail.com>
Date: Sun, 23 Sep 2018 12:00:22 +0700
Subject: [PATCH] Refactor: Task Layout

---
 roles/kolibri/tasks/main.yml | 47 ++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index 40cdac2e4..b2526b4be 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -29,6 +29,32 @@
     extra_args: --no-cache-dir
   when: internet_available
 
+- name: Set kolibri default language
+  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
+  ignore_errors: yes
+  when: kolibri_provision
+
+- name: Set kolibri default language
+  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
+  ignore_errors: yes
+  when: kolibri_provision
+
+- name: Create kolibri default facility name, admin account and language
+  shell: >
+    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
+  ignore_errors: yes
+  when: kolibri_provision
+
+- name: Change /library/kolibri directory permissions
+  file:
+    path: "{{ kolibri_home }}"
+    owner: "{{ kolibri_user }}"
+    group: "{{ apache_user }}"
+    recurse: yes
+
 - name: Create kolibri systemd service unit file
   template:
     src: "{{ item.src }}"
@@ -54,27 +80,6 @@
     state: stopped
   when: not kolibri_enabled
 
-- name: Set kolibri default language
-  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
-  ignore_errors: yes
-  when: kolibri_provision
-
-- name: Create kolibri default facility name, admin account and language
-  shell: >
-    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
-  ignore_errors: yes
-  when: kolibri_provision
-
-- name: Change /library/kolibri directory permissions
-  file:
-    path: "{{ kolibri_home }}"
-    owner: "{{ kolibri_user }}"
-    group: "{{ apache_user }}"
-    recurse: yes
-
 - name: Add 'kolibri' to list of services at /etc/iiab/iiab.ini
   ini_file:
     dest: "{{ service_filelist }}"