Merge pull request #889 from holta/kalite-0.17.5

KA Lite 0.17.4 -> 0.17.5

roles/kalite/defaults/main.yml

@@ -1,21 +1,29 @@
----
 # The values here are defaults.
-# To override them edit the main var definitions in iiab/vars
-kalite_version: "0.17.4"
+# To override them edit the main var definitions in /opt/iiab/iiab/vars/local_vars.yml
+
+kalite_install: True
+kalite_enabled: False
+
+kalite_version: "0.17.5"
 kalite_repo_url: "https://github.com/learningequality/ka-lite.git"
+kalite_requirements: "https://raw.githubusercontent.com/learningequality/ka-lite/master/requirements.txt"
+
 kalite_venv: "/usr/local/kalite/venv"
 kalite_program: "{{ kalite_venv }}/bin/kalite"
-kalite_requirements: "https://raw.githubusercontent.com/learningequality/ka-lite/master/requirements.txt"
 kalite_root: "/library/ka-lite"
+
+kalite_server_port: 8008
+kalite_admin_user: Admin
+kalite_admin_password: changeme
+
+# Unused in 2018; but remain as placeholders for Fedora 18 legacy (XO laptops)
+kalite_cron_enabled: False
 kalite_user: kalite
 # obtain a password hash with - python -c 'import crypt; print crypt.crypt("<plaintext>", "$6$<salt>")'
 kalite_password_hash: $6$<salt>$KHET0XRRsgAY.wOWyTOI3W7dyDh0ESOr48uI5vtk2xdzsU7aw0TF4ZkNuM34RmHBGMJ1fTCmOyVobo0LOhBlJ/
 kalite_password: kalite
-kalite_admin_user: Admin
-kalite_admin_password: changeme
-kalite_server_name: kalite
-kalite_server_port: 8008
-kalite_enabled: False
-kalite_cron_enabled: False
-khan_assessment_install: True
-khan_assessment_url: "http://pantry.learningequality.org/downloads/ka-lite/0.16/content/khan_assessment.zip"
+
+# Unused in 2018
+# kalite_server_name: kalite
+# khan_assessment_install: True
+# khan_assessment_url: "http://pantry.learningequality.org/downloads/ka-lite/0.16/content/khan_assessment.zip"

vars/default_vars.yml

@@ -295,14 +295,16 @@ wordpress_enabled: False
 
 # KA Lite
 kalite_install: True
+kalite_enabled: False
+kalite_server_port: 8008
 kalite_root: "/library/ka-lite"
+# Unused in 2018; but remain as placeholders for Fedora 18 legacy (XO laptops)
+kalite_cron_enabled: False
 kalite_user: kalite
 kalite_password_hash: $6$<salt>$KHET0XRRsgAY.wOWyTOI3W7dyDh0ESOr48uI5vtk2xdzsU7aw0TF4ZkNuM34RmHBGMJ1fTCmOyVobo0LOhBlJ/
 kalite_password: kalite
-kalite_server_name: kalite
-kalite_server_port: 8008
-kalite_enabled: False
-kalite_cron_enabled: False
+# Unused in 2018
+# kalite_server_name: kalite
 
 # Kiwix
 kiwix_install: True

vars/local_vars_big.yml

@@ -159,6 +159,7 @@ wordpress_enabled: True
 
 kalite_install: True
 kalite_enabled: True
+# Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops)
 kalite_cron_enabled: True
 
 kiwix_install: True

vars/local_vars_big_vpn.yml

@@ -159,6 +159,7 @@ wordpress_enabled: True
 
 kalite_install: True
 kalite_enabled: True
+# Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops)
 kalite_cron_enabled: True
 
 kiwix_install: True

vars/local_vars_medium.yml

@@ -159,6 +159,7 @@ wordpress_enabled: True
 
 kalite_install: True
 kalite_enabled: True
+# Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops)
 kalite_cron_enabled: True
 
 kiwix_install: True

vars/local_vars_medium_vpn.yml

@@ -159,6 +159,7 @@ wordpress_enabled: True
 
 kalite_install: True
 kalite_enabled: True
+# Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops)
 kalite_cron_enabled: True
 
 kiwix_install: True

vars/local_vars_min.yml

@@ -159,6 +159,7 @@ wordpress_enabled: False
 
 kalite_install: True
 kalite_enabled: True
+# Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops)
 kalite_cron_enabled: True
 
 kiwix_install: True

vars/local_vars_min_vpn.yml

@@ -159,6 +159,7 @@ wordpress_enabled: False
 
 kalite_install: True
 kalite_enabled: True
+# Unused in 2018; but remains as placeholder for Fedora 18 legacy (XO laptops)
 kalite_cron_enabled: True
 
 kiwix_install: True