From a4367de16c3fd0c81a4bd956e755c7a4eafa1def Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 12:46:24 -0400 Subject: [PATCH 1/9] Clarify Kolibri installation / migration requirements, per @benjaoming --- roles/kolibri/tasks/main.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index e3fdc8e9b..6415d7222 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -25,23 +25,27 @@ group: root mode: 0755 +# 2019-10-14: An alternative might be to put KOLIBRI_USER="kolibri" into +# /etc/kolibri/conf.d/iiab.conf - name: Save kolibri_user ({{ kolibri_user }}) to /etc/kolibri/username copy: - content: "{{ kolibri_user }}" + content: "{{ kolibri_user }}" # i.e. kolibri dest: /etc/kolibri/username owner: root group: root mode: 0644 - + +# 2019-10-14: An alternative mentioned by @benjaoming (Benjamin Bach) would be +# to put KOLIBRI_HOME="/library/kolibri" into /etc/kolibri/conf.d/iiab.conf - name: Save kolibri_home (KOLIBRI_HOME="{{ kolibri_home }}") to /etc/kolibri/daemon.conf copy: - content: 'KOLIBRI_HOME="{{ kolibri_home }}"' + content: 'KOLIBRI_HOME="{{ kolibri_home }}"' # i.e. /library/kolibri dest: /etc/kolibri/daemon.conf owner: root group: root mode: 0644 -- name: apt install latest Kolibri .deb from {{ kolibri_deb_url }} (populates {{ kolibri_home }}, migrates database) # i.e. /library/kolibri +- name: apt install latest Kolibri .deb from {{ kolibri_deb_url }} (populates {{ kolibri_home }} / migrates database, based on params set in /etc/kolibri) apt: deb: "{{ kolibri_deb_url }}" # https://learningequality.org/r/kolibri-deb-latest environment: From 6bbfde4012407b104037d20d00a2991597e42b5e Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 12:54:29 -0400 Subject: [PATCH 2/9] Is "chmod -R kolibri:www-data /library/kolibri" nec? --- roles/kolibri/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index 6415d7222..360589266 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -100,6 +100,8 @@ become_user: "{{ kolibri_user }}" when: kolibri_provision | bool +# 2019-10-14: QUESTION FOR @benjaoming...is this stanza really necessary +# (shouldn't migration & provisiondevice above be sufficient?) - name: chown -R {{ kolibri_user }}:{{ apache_user }} {{ kolibri_home }} for good measure? file: path: "{{ kolibri_home }}" # /library/kolibri From c11495951dfb973b4b2c27cabc6a0474504ad95a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 14:12:17 -0400 Subject: [PATCH 3/9] Comment out chown stanza, per @benjaoming --- roles/kolibri/tasks/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml index 360589266..5c2ccd757 100644 --- a/roles/kolibri/tasks/main.yml +++ b/roles/kolibri/tasks/main.yml @@ -100,15 +100,15 @@ become_user: "{{ kolibri_user }}" when: kolibri_provision | bool -# 2019-10-14: QUESTION FOR @benjaoming...is this stanza really necessary -# (shouldn't migration & provisiondevice above be sufficient?) -- name: chown -R {{ kolibri_user }}:{{ apache_user }} {{ kolibri_home }} for good measure? - file: - path: "{{ kolibri_home }}" # /library/kolibri - owner: "{{ kolibri_user }}" # kolibri - group: "{{ apache_user }}" # www-data (on Debian/Ubuntu/Raspbian) - recurse: yes - when: kolibri_provision | bool +# 2019-10-14: This stanza should not be necessary according to @benjaoming +# (Benjamin Bach) especially as migration & provisiondevice were run above. +#- name: chown -R {{ kolibri_user }}:{{ apache_user }} {{ kolibri_home }} for good measure? +# file: +# path: "{{ kolibri_home }}" # /library/kolibri +# owner: "{{ kolibri_user }}" # kolibri +# group: "{{ apache_user }}" # www-data (on Debian/Ubuntu/Raspbian) +# recurse: yes +# when: kolibri_provision | bool # 2019-10-07: Moved to roles/httpd/tasks/main.yml From 42b330b613f41e5757adbbc60e047082811c799c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 14:42:43 -0400 Subject: [PATCH 4/9] php_version: 7.2 -> 7.3 --- vars/ubuntu-19.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/ubuntu-19.yml b/vars/ubuntu-19.yml index 5b89d04fc..d6afbcf33 100644 --- a/vars/ubuntu-19.yml +++ b/vars/ubuntu-19.yml @@ -22,7 +22,7 @@ mysql_service: mariadb apache_log: /var/log/apache2/access.log sshd_package: openssh-server sshd_service: ssh -php_version: 7.2 +php_version: 7.3 # "postgresql_version: 11.2" fails (too detailed for /etc/systemd/system/postgresql-iiab.service on Ubuntu 19.04) postgresql_version: 11 systemd_location: /lib/systemd/system From 80c75fd6f80f704e09944947101c50c68a699669 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 15:06:08 -0400 Subject: [PATCH 5/9] Lokole: install pkg python3-bcrypt (instead of bcrypt) --- roles/lokole/tasks/install.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/lokole/tasks/install.yml b/roles/lokole/tasks/install.yml index c1033b8fe..194472ac6 100644 --- a/roles/lokole/tasks/install.yml +++ b/roles/lokole/tasks/install.yml @@ -1,7 +1,7 @@ # Lokole PDF (User's Guide) gets copied for offline use (http://box/info) here: # https://github.com/iiab/iiab/blob/master/roles/httpd/templates/refresh-wiki-docs.sh#L47 -- name: "Install 7 packages for Lokole: python3, python3-pip, python3-venv, python3-dev, libffi-dev, libssl-dev, bcrypt" +- name: "Install 7 packages for Lokole: python3, python3-pip, python3-venv, python3-dev, libffi-dev, libssl-dev, python3-bcrypt" apt: name: - python3 @@ -10,7 +10,8 @@ - python3-dev - libffi-dev - libssl-dev - - bcrypt + #- bcrypt does not exist on Ubuntu 19.10 + - python3-bcrypt # 2019-10-14: should work across modern Linux OS's state: present tags: - install From 466a324a87193039bb7fb6e92f98ef16869635d0 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 15:55:01 -0400 Subject: [PATCH 6/9] osm-vector-maps: use python3-geojson (python-geojson no longer avail on Ubuntu 19.10) --- roles/osm-vector-maps/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index c4f8ac726..ea169f6b2 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/roles/osm-vector-maps/tasks/main.yml @@ -34,9 +34,9 @@ url: "{{ iiab_map_url }}/assets/bboxes.geojson" dest: '{{ vector_map_path }}/maplist/assets/' -- name: Install python-geojson package, that helps with geojson +- name: Install python3-geojson package, that helps with geojson package: - name: python-geojson + name: python3-geojson state: present - name: Install /usr/bin/iiab-update-map for updating of Map Pack catalog & descriptions From 3f3e313b8d2fb06d7c737e5708aeecbda9b972e9 Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 17:20:40 -0400 Subject: [PATCH 7/9] Clarify python3-geojson in osm-vector-maps/tasks/main.yml --- roles/osm-vector-maps/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index ea169f6b2..dd25b7afa 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/roles/osm-vector-maps/tasks/main.yml @@ -36,7 +36,8 @@ - name: Install python3-geojson package, that helps with geojson package: - name: python3-geojson + #name: python-geojson does not exist on Ubuntu 19.10 + name: python3-geojson # 2019-10-14: should work across modern Linux OS's state: present - name: Install /usr/bin/iiab-update-map for updating of Map Pack catalog & descriptions From d670a1e1626fd28cb5b5fdff79c8543c86e9666f Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 23:31:53 -0400 Subject: [PATCH 8/9] calibre_via_debs: True [was False] in vars/debian-10.yml --- vars/debian-10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/debian-10.yml b/vars/debian-10.yml index f823408e9..6db386cf6 100644 --- a/vars/debian-10.yml +++ b/vars/debian-10.yml @@ -25,5 +25,5 @@ php_version: 7.3 postgresql_version: 11 systemd_location: /lib/systemd/system # Upgrade OS's own Calibre to very latest: -calibre_via_debs: True +calibre_via_debs: False calibre_via_python: False From 70ba01a503ef5eee35c05925714565f7a010c98a Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 14 Oct 2019 23:42:03 -0400 Subject: [PATCH 9/9] calibre_via_python: True [was False] in vars/debian-10.yml --- vars/debian-10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/debian-10.yml b/vars/debian-10.yml index 6db386cf6..9c82440f6 100644 --- a/vars/debian-10.yml +++ b/vars/debian-10.yml @@ -26,4 +26,4 @@ postgresql_version: 11 systemd_location: /lib/systemd/system # Upgrade OS's own Calibre to very latest: calibre_via_debs: False -calibre_via_python: False +calibre_via_python: True