Merge pull request #3507 from holta/kolibri-hygiene

Move 2 vars kolibri/defaults to default_vars.yml + Cleaner kolibri homedir in /etc/passwd

roles/kolibri/defaults/main.yml

@@ -3,11 +3,21 @@
 
 # kolibri_language: en    # See KOLIBRI_SUPPORTED_LANGUAGES at the bottom of https://github.com/learningequality/kolibri/blob/develop/kolibri/utils/i18n.py
 
+# Kolibri folder to store its data and configuration files.
+# kolibri_home: "{{ content_base }}/kolibri"    # /library/kolibri
+
+# kolibri_user: kolibri    # Whereas a vanilla install of Kolibri auto-identifies
+# and saves a 'desktop-like' user like {iiab-admin, pi} to /etc/kolibri/username
+# (generally the user with lowest UID >= 1000) to allow access to USB devices:
+# https://kolibri.readthedocs.io/en/latest/install/ubuntu-debian.html#changing-the-owner-of-kolibri-system-service
+# https://github.com/learningequality/kolibri-installer-debian/issues/115
+
 # kolibri_http_port: 8009
 
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
 
+
 # 2019-09-27: Pinning to a particular version is unfortunately NOT supported
 # with our new apt approach (.deb installer) at this time.
 # 2019-06-21: Uncomment this pinning line if you want a particular version of
@@ -30,19 +40,11 @@
 # Corresponding to:
 # https://launchpad.net/~learningequality/+archive/ubuntu/kolibri
 
-# Kolibri folder to store its data and configuration files.
-kolibri_home: "{{ content_base }}/kolibri"    # /library/kolibri
-
 kolibri_url_without_slash: /kolibri
 kolibri_url: "{{ kolibri_url_without_slash }}/"    # /kolibri/
 
 kolibri_exec_path: /usr/bin/kolibri
 
-kolibri_user: kolibri    # Whereas a vanilla install of Kolibri auto-identifies
-# and saves a 'desktop' user like {iiab-admin, pi} to /etc/kolibri/username,
-# towards guaranteeing access to USB devices, per:
-# https://kolibri.readthedocs.io/en/latest/install.html#changing-the-owner-of-kolibri-system-service
-
 # To populate /library/kolibri with essential/minimum files and dirs.  This
 # provisions Kolibri with facility name, admin acnt / password, preset type,
 # and language.  You can set this to 'False' when reinstalling Kolibri:

roles/kolibri/tasks/install.yml

@@ -14,6 +14,7 @@
     shell: /bin/false
     system: yes
     create_home: no
+    home: "{{ kolibri_home }}"
 
 - name: Create directory {{ kolibri_home }} for Kolibri content, configuration, sqlite3 databases ({{ kolibri_user }}:{{ apache_user }}, by default 0755)
   file:

vars/default_vars.yml

@@ -484,6 +484,8 @@ kalite_root: "{{ content_base }}/ka-lite"    # /library/ka-lite
 kolibri_install: False
 kolibri_enabled: False
 kolibri_language: en     # See KOLIBRI_SUPPORTED_LANGUAGES at the bottom of https://github.com/learningequality/kolibri/blob/develop/kolibri/utils/i18n.py
+kolibri_home: "{{ content_base }}/kolibri"    # /library/kolibri
+kolibri_user: kolibri    # WARNING: https://github.com/learningequality/kolibri-installer-debian/issues/115
 kolibri_http_port: 8009
 
 # kiwix_install: True is REQUIRED, if you install IIAB's Admin Console