From 486f66b6ae56dbf41e59cf5442d1681a986d888a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 11:54:19 -0400 Subject: [PATCH 01/15] Update main.yml --- roles/kolibri/defaults/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/kolibri/defaults/main.yml b/roles/kolibri/defaults/main.yml index 769604cd1..d0c0d29e3 100644 --- a/roles/kolibri/defaults/main.yml +++ b/roles/kolibri/defaults/main.yml @@ -1,9 +1,9 @@ # The values here are defaults. -# To override them edit the main var definitions in iiab/vars +# To override them edit /opt/iiab/iiab/vars/local_vars.yml # Installation Variables -kolibri_install: True -kolibri_enabled: True +kolibri_install: False +kolibri_enabled: False # Kolibri folder to store its data and configuration files. kolibri_home: "{{ content_base }}/kolibri" @@ -21,14 +21,14 @@ kolibri_user: kolibri kolibri_provision: True # Kolibri Facility name -kolibri_facility: 'Kolibri-in-a-Box' +kolibri_facility: Kolibri-in-a-Box # Kolibri Preset type: formal, nonformal, informal -kolibri_preset: 'formal' +kolibri_preset: formal # Kolibri default language (ar,bn-bd,en,es-es,fa,fr-fr,hi-in,mr,nyn,pt-br,sw-tz,ta,te,ur-pk,yo,zu) -kolibri_language: 'en' +kolibri_language: en # Kolibri admin account -kolibri_admin_user: 'Admin' -kolibri_admin_password: 'changeme' +kolibri_admin_user: Admin +kolibri_admin_password: changeme From 33bbf5f906203be6c76817069095b75d83315633 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:00:08 -0400 Subject: [PATCH 02/15] Update main.yml --- roles/kolibri/tasks/main.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index 89ce010d6..064efaca1 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -1,4 +1,3 @@ ---- - name: Create a Kolibri system user and to www-data, disk groups user: name: "{{ kolibri_user }}" @@ -10,7 +9,7 @@ system: yes create_home: no -- name: Create Kolibri folder to store data and configuration files. +- name: Create /library/kolibri to store data and configuration files file: path: "{{ item }}" owner: "{{ kolibri_user }}" @@ -37,12 +36,12 @@ with_items: - { src: 'kolibri.service.j2' , dest: '/etc/systemd/system/kolibri.service', mode: '0644' } -- name: Set kolibri default language. +- 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. +- name: Create kolibri default facility name, admin account and language shell: > export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" manage provisiondevice --facility "{{ kolibri_facility }}" @@ -51,14 +50,14 @@ ignore_errors: yes when: kolibri_provision -- name: Change /library/kolibri directory permissions. +- name: Change /library/kolibri directory permissions file: path: "{{ kolibri_home }}" owner: "{{ kolibri_user }}" group: "{{ apache_user }}" recurse: yes -- name: Enable kolibri service. +- name: Enable kolibri service service: name: "{{ item.name }}" enabled: yes @@ -67,7 +66,7 @@ - { name: kolibri } when: kolibri_enabled -- name: Disable kolibri service. +- name: Disable kolibri service service: name: "{{ item.name }}" enabled: no From 5efdb563b4f8bbf9fb7224f206268125c540e4e4 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:04:50 -0400 Subject: [PATCH 03/15] Update README.rst --- roles/kolibri/README.rst | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/kolibri/README.rst b/roles/kolibri/README.rst index eb0b5d4ee..80427440f 100644 --- a/roles/kolibri/README.rst +++ b/roles/kolibri/README.rst @@ -2,7 +2,7 @@ Kolibri README ============== -This role install Kolibri, an open-source educational platform specially designed +This role installs Kolibri, an open-source educational platform specially designed to provide offline access to a wide range of quality, openly licensed educational contents in low-resource contexts like rural schools, refugee camps, orphanages, and also in non-formal school programs. @@ -10,12 +10,12 @@ and also in non-formal school programs. Access ------ -If enabled and with the default settings Kolibri should be accessible at http://box:8009/ +If enabled and with the default settings Kolibri should be accessible at http://box:8009 To login to Kolibri enter - User Name: Admin - + Username: Admin + Password: changeme Configuration Parameters @@ -26,6 +26,7 @@ in this readme assumes the default values. Automatic Device Provisioning ----------------------------- + When kolibri_provision is enabled, the installation will setup the following settings: Kolibri Facility name: 'Kolibri-in-a-Box' @@ -40,12 +41,12 @@ When kolibri_provision is enabled, the installation will setup the following set Cloning content --------------- -In Kolibri 0.10 introduced `kolibri manage deprovision` which will remove + +Kolibri 0.10 introduced `kolibri manage deprovision` which will remove user configuration, leaving content intact. You can then copy/clone /library/kolibri to a new location. - -Trouble Shooting +Troubleshooting ---------------- You can run the server manually with the following commands: @@ -54,7 +55,7 @@ You can run the server manually with the following commands: export KOLIBRI_HOME=/library/kolibri - export KOLIBRI_HTTP_PORT=8009 (other Kolibri will run on default port 8080) + export KOLIBRI_HTTP_PORT=8009 (otherwise Kolibri will try to run on default port 8080) kolibri start From 9dd9db7e5aa7fbd40f238f3d3a24f31f6ec3d704 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:06:39 -0400 Subject: [PATCH 04/15] Update README.rst --- roles/kolibri/README.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/roles/kolibri/README.rst b/roles/kolibri/README.rst index 80427440f..3ab9bcf19 100644 --- a/roles/kolibri/README.rst +++ b/roles/kolibri/README.rst @@ -2,10 +2,11 @@ Kolibri README ============== -This role installs Kolibri, an open-source educational platform specially designed -to provide offline access to a wide range of quality, openly licensed educational -contents in low-resource contexts like rural schools, refugee camps, orphanages, -and also in non-formal school programs. +This Ansible role installs Kolibri within Internet-in-a-Box. Kolibri is an +open-source educational platform specially designed to provide offline access +to a wide range of quality, openly licensed educational contents in +low-resource contexts like rural schools, refugee camps, orphanages, and also +in non-formal school programs. Access ------ From ea09e45c4cefcc241444a96c7d276219aa19cc77 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:09:52 -0400 Subject: [PATCH 05/15] Update default_vars.yml --- vars/default_vars.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 18beac3d4..05cc37f58 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -313,6 +313,10 @@ kalite_password: kalite # Unused in 2018 # kalite_server_name: kalite +# Kolibri +kolibri_install: False +kolibri_enabled: False + # Kiwix kiwix_install: True kiwix_enabled: True From c437375eaac789825a704946788af22996d3e771 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:10:33 -0400 Subject: [PATCH 06/15] Update local_vars_min.yml --- vars/local_vars_min.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 2029a64e5..6ca4dcb05 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -170,6 +170,9 @@ kalite_enabled: True # Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops) kalite_cron_enabled: True +kolibri_install: False +kolibri_enabled: False + kiwix_install: True kiwix_enabled: True From a16a467caac45c3c63b9b20a6d05acc123de9a81 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:10:56 -0400 Subject: [PATCH 07/15] Update local_vars_min_vpn.yml --- vars/local_vars_min_vpn.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_min_vpn.yml b/vars/local_vars_min_vpn.yml index 55f57fefb..ec7aeb7bf 100644 --- a/vars/local_vars_min_vpn.yml +++ b/vars/local_vars_min_vpn.yml @@ -170,6 +170,9 @@ kalite_enabled: True # Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops) kalite_cron_enabled: True +kolibri_install: False +kolibri_enabled: False + kiwix_install: True kiwix_enabled: True From 67098c54a03a53236fe69e8a9c9630ff66cf2522 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:11:13 -0400 Subject: [PATCH 08/15] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index be4c943cc..f45033497 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -170,6 +170,9 @@ kalite_enabled: True # Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops) kalite_cron_enabled: True +kolibri_install: False +kolibri_enabled: False + kiwix_install: True kiwix_enabled: True From b4c1aad744e432b014a04028136f9000b928d33b Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:11:48 -0400 Subject: [PATCH 09/15] Update local_vars_medium_vpn.yml --- vars/local_vars_medium_vpn.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_medium_vpn.yml b/vars/local_vars_medium_vpn.yml index 6718b6ac4..0750d4a2c 100644 --- a/vars/local_vars_medium_vpn.yml +++ b/vars/local_vars_medium_vpn.yml @@ -170,6 +170,9 @@ kalite_enabled: True # Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops) kalite_cron_enabled: True +kolibri_install: False +kolibri_enabled: False + kiwix_install: True kiwix_enabled: True From 5d099a1bceb37cc30b5508b8a0118141cc73d089 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:12:23 -0400 Subject: [PATCH 10/15] Update local_vars_big.yml --- vars/local_vars_big.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 50103c6fc..66f5bd196 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -170,6 +170,9 @@ kalite_enabled: True # Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops) kalite_cron_enabled: True +kolibri_install: True +kolibri_enabled: True + kiwix_install: True kiwix_enabled: True From 3474dc9388dd0e4a9068605b7fa245dd2dd9e212 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:12:46 -0400 Subject: [PATCH 11/15] Update local_vars_big_vpn.yml --- vars/local_vars_big_vpn.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vars/local_vars_big_vpn.yml b/vars/local_vars_big_vpn.yml index 7664b19f3..054c428df 100644 --- a/vars/local_vars_big_vpn.yml +++ b/vars/local_vars_big_vpn.yml @@ -170,6 +170,9 @@ kalite_enabled: True # Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops) kalite_cron_enabled: True +kolibri_install: True +kolibri_enabled: True + kiwix_install: True kiwix_enabled: True From 1a677955e087672bdcaf104e036339377d262b21 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:13:53 -0400 Subject: [PATCH 12/15] Update main.yml --- roles/7-edu-apps/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 62699e42b..941f6347e 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -9,6 +9,12 @@ when: kalite_install tags: kalite +- name: KOLIBRI + include_role: + name: kolibri + when: kolibri_install + tags: kolibri + - name: KIWIX include_role: name: kiwix From 12755266679c6d72223baa2878a7b32c38f86818 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:16:53 -0400 Subject: [PATCH 13/15] Update README.rst --- roles/kolibri/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kolibri/README.rst b/roles/kolibri/README.rst index 3ab9bcf19..197581251 100644 --- a/roles/kolibri/README.rst +++ b/roles/kolibri/README.rst @@ -16,7 +16,7 @@ If enabled and with the default settings Kolibri should be accessible at http:// To login to Kolibri enter Username: Admin - + Password: changeme Configuration Parameters From 3ee69f613b031ea007623207b68ff705dafb3c1f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:31:57 -0400 Subject: [PATCH 14/15] Update main.yml --- roles/kolibri/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index 064efaca1..14230d9ad 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -19,7 +19,6 @@ with_items: - "{{ kolibri_home }}" - - name: Install kolibri using pip on all OS's pip: name: kolibri From 1d168efe89e0bad4bb4984fcf48e0c0e189b5111 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 16 Jul 2018 12:33:58 -0400 Subject: [PATCH 15/15] Update main.yml --- roles/kolibri/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kolibri/defaults/main.yml b/roles/kolibri/defaults/main.yml index d0c0d29e3..e19db7b0d 100644 --- a/roles/kolibri/defaults/main.yml +++ b/roles/kolibri/defaults/main.yml @@ -11,7 +11,7 @@ kolibri_home: "{{ content_base }}/kolibri" kolibri_http_port: 8009 kolibri_url: /kolibri/ kolibri_path: "{{ iiab_base }}/kolibri" -kolibri_exec_path: /usr/local/bin/kolibri +kolibri_exec_path: /usr/bin/kolibri # Kolibri system user kolibri_user: kolibri