Merge pull request #297 from iiab/master

sync from iiab/iiab
2025-03-09 15:40:17 +00:00 · 2019-10-07 13:43:09 -04:00 · 2019-10-07 13:43:09 -04:00 · 02838d27e5
commit 02838d27e5
parent d47346487b 834fa0ef18
8 changed files with 78 additions and 66 deletions
--- a/roles/9-local-addons/tasks/main.yml
+++ b/roles/9-local-addons/tasks/main.yml
@ -3,18 +3,6 @@
 - name: ...IS BEGINNING ====================================
  command: echo

- name: CALIBRE
-  include_role:
-    name: calibre
-  when: calibre_install | bool
-  tags: calibre
-
- name: CALIBRE-WEB
-  include_role:
-    name: calibre-web
-  when: calibreweb_install | bool
-  tags: calibre-web
-
 - name: INTERNETARCHIVE
  include_role:
    name: internetarchive
@ -27,6 +15,19 @@
  when: minetest_install | bool
  tags: minetest

+# KEEP AT THE END as this installs dependencies from Debian's 'testing' branch!
+- name: CALIBRE
+  include_role:
+    name: calibre
+  when: calibre_install | bool
+  tags: calibre
+
+- name: CALIBRE-WEB
+  include_role:
+    name: calibre-web
+  when: calibreweb_install | bool
+  tags: calibre-web
+
 - name: Recording STAGE 9 HAS COMPLETED ====================
  lineinfile:
    dest: "{{ iiab_env_file }}"
--- a/roles/internetarchive/tasks/main.yml
+++ b/roles/internetarchive/tasks/main.yml
@ -5,7 +5,7 @@
    msg: "Internet Archive install cannot proceed, as it currently requires Node.js 10.x or 12.x, and your nodejs_version is set to {{ nodejs_version }}.  Please check the value of nodejs_version in /opt/iiab/iiab/vars/default_vars.yml and possibly also /etc/iiab/local_vars.yml"
  when: internetarchive_install and (nodejs_version != "10.x") and (nodejs_version != "12.x")

- name: Install packages needed by Distributed Web
+- name: Install packages needed by Internet Archive Offline
  package:
    name:
      - libsecret-1-dev
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@ -32,8 +32,16 @@
    owner: root
    group: root
    mode: 0644
+    
+- name: Save kolibri_home (KOLIBRI_HOME="{{ kolibri_home }}") to /etc/kolibri/daemon.conf
+  copy:
+    content: 'KOLIBRI_HOME="{{ kolibri_home }}"'
+    dest: /etc/kolibri/daemon.conf
+    owner: root
+    group: root
+    mode: 0644

- name: apt install latest Kolibri .deb from {{ kolibri_deb_url }}
+- name: apt install latest Kolibri .deb from {{ kolibri_deb_url }} (populates {{ kolibri_home }}, migrates database)    # i.e. /library/kolibri
  apt:
    deb: "{{ kolibri_deb_url }}"    # https://learningequality.org/r/kolibri-deb-latest
  environment:
@ -60,26 +68,29 @@
    state: stopped


- name: Run Kolibri migrations to begin populating {{ kolibri_home }}    # i.e. /library/kolibri
-  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" manage migrate
-  ignore_errors: yes
-  become: yes
-  become_user: "{{ kolibri_user }}"
-  when: kolibri_provision | bool
+# 2019-10-01: Should no longer be nec, thanks to /etc/kolibri/daemon.conf
+#             containing KOLIBRI_HOME="/library/kolibri" (above)
+#- name: Run Kolibri migrations to begin populating {{ kolibri_home }}    # i.e. /library/kolibri
+#  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" manage migrate
+#  ignore_errors: yes
+#  become: yes
+#  become_user: "{{ kolibri_user }}"
+#  when: kolibri_provision | bool

- name: Set Kolibri default language
+- name: Set Kolibri default language ({{ kolibri_language }})
  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
  ignore_errors: yes
  become: yes
  become_user: "{{ kolibri_user }}"
  when: kolibri_provision | bool

- name: Set Kolibri facility name, admin acnt / password, preset type, and language
+- name: 'Provision Kolibri, while setting: facility name, admin acnt / password, preset type, 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
+    --preset "{{ kolibri_preset }}" --language_id "{{ kolibri_language }}"
+    #--preset "{{ kolibri_preset }}" --language_id "{{ kolibri_language }}" --verbosity 0 --noinput
  ignore_errors: yes
  become: yes
  become_user: "{{ kolibri_user }}"
--- a/roles/nodered/README.rst
+++ b/roles/nodered/README.rst
@ -20,7 +20,7 @@ Username: ``Admin``

 Password: ``changeme``

-To change this password, please see: `roles/nodered/defaults/main.yml <defaults/main.yml#L11-L26>`_
+To change this password, please see: `roles/nodered/defaults/main.yml <defaults/main.yml#L12-L27>`_

 You can monitor the Node-RED service with command::

@ -29,7 +29,7 @@ You can monitor the Node-RED service with command::
 Raspberry Pi Zero W Warning
 ---------------------------

-Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer `won't work <https://nodered.org/docs/hardware/raspberrypi#swapping-sd-cards>`_ on Raspberry Pi Zero W (ARM6) if you installed Node.js while on RPi 3 or 3 B+ (ARM7).  If necessary, run ``apt remove nodejs`` then ``cd /opt/iiab/iiab`` then `./runrole nodejs <https://github.com/iiab/iiab/blob/master/roles/nodejs/tasks/main.yml>`_ *on the Raspberry Pi Zero W itself* — before proceeding to install Asterisk/FreePBX, Node-RED and/or Sugarizer.
+Node.js applications like Asterisk/FreePBX, Node-RED and Sugarizer *won't work* on Raspberry Pi Zero W (ARMv6) if you installed Node.js while on RPi 3, 3 B+ (ARMv7) or RPi 4 (ARMv8).  If necessary, run ``apt remove nodejs`` then (`attempt! <https://nodered.org/docs/hardware/raspberrypi#swapping-sd-cards>`_) things like ``cd /opt/iiab/iiab; ./runrole nodejs`` to `install Node.js <https://github.com/iiab/iiab/blob/master/roles/nodejs/tasks/main.yml>`_ *on the Raspberry Pi Zero W itself* — before proceeding to install Asterisk/FreePBX, Node-RED and/or Sugarizer.

 See Also
 --------
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@ -493,6 +493,20 @@ vnstat_enabled: True

 # 9-LOCAL-ADDONS

+# Internet Archive Decentralized Web - create your own offline version box:4244
+# (or http://box/archive) arising from digital library https://dweb.archive.org
+internetarchive_install: False
+internetarchive_enabled: False
+internetarchive_port: 4244    # for http://box:4244
+
+# Minetest is an open source clone of the Minecraft building blocks game
+minetest_install: False
+minetest_enabled: False
+minetest_port: 30000
+minetest_server_admin: Admin
+minetest_default_game: carbone-ng    # only carbone-ng and minetest are supported
+minetest_flat_world: False
+
 # Calibre E-Book Library
 # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
 # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
@ -523,20 +537,6 @@ calibreweb_url2: /libros    # For SHORT URL http://box/libros (Spanish)
 calibreweb_url3: /livres    # For SHORT URL http://box/livres (French)
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web

-# Internet Archive Decentralized Web - create your own offline version box:4244
-# (or http://box/archive) arising from digital library https://dweb.archive.org
-internetarchive_install: False
-internetarchive_enabled: False
-internetarchive_port: 4244    # for http://box:4244
-
-# Minetest is an open source clone of the Minecraft building blocks game
-minetest_install: False
-minetest_enabled: False
-minetest_port: 30000
-minetest_server_admin: Admin
-minetest_default_game: carbone-ng    # only carbone-ng and minetest are supported
-minetest_flat_world: False
-

 # =============================================================================
 # UNMAINTAINED LEGACY VARIABLES: YOU'RE TAKING BIG RISKS IF YOU USE ANY HERE...
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@ -326,6 +326,15 @@ vnstat_enabled: True

 # 9-LOCAL-ADDONS

+# Internet Archive Decentralized Web - create your own offline version box:4244
+# (or http://box/archive) arising from digital library https://dweb.archive.org
+internetarchive_install: True
+internetarchive_enabled: True
+
+# Minetest is an open source clone of the Minecraft building blocks game
+minetest_install: True
+minetest_enabled: True
+
 # Calibre E-Book Library
 # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
 # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
@ -350,15 +359,6 @@ calibreweb_url2: /libros    # For SHORT URL http://box/libros (Spanish)
 calibreweb_url3: /livres    # For SHORT URL http://box/livres (French)
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web

-# Internet Archive Decentralized Web - create your own offline version box:4244
-# (or http://box/archive) arising from digital library https://dweb.archive.org
-internetarchive_install: True
-internetarchive_enabled: True
-
-# Minetest is an open source clone of the Minecraft building blocks game
-minetest_install: True
-minetest_enabled: True
-

 # CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD:
 #
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@ -326,6 +326,15 @@ vnstat_enabled: True

 # 9-LOCAL-ADDONS

+# Internet Archive Decentralized Web - create your own offline version box:4244
+# (or http://box/archive) arising from digital library https://dweb.archive.org
+internetarchive_install: False
+internetarchive_enabled: False
+
+# Minetest is an open source clone of the Minecraft building blocks game
+minetest_install: False
+minetest_enabled: False
+
 # Calibre E-Book Library
 # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
 # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
@ -350,15 +359,6 @@ calibreweb_url2: /libros    # For SHORT URL http://box/libros (Spanish)
 calibreweb_url3: /livres    # For SHORT URL http://box/livres (French)
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web

-# Internet Archive Decentralized Web - create your own offline version box:4244
-# (or http://box/archive) arising from digital library https://dweb.archive.org
-internetarchive_install: False
-internetarchive_enabled: False
-
-# Minetest is an open source clone of the Minecraft building blocks game
-minetest_install: False
-minetest_enabled: False
-

 # CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD:
 #
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@ -326,6 +326,15 @@ vnstat_enabled: True

 # 9-LOCAL-ADDONS

+# Internet Archive Decentralized Web - create your own offline version box:4244
+# (or http://box/archive) arising from digital library https://dweb.archive.org
+internetarchive_install: False
+internetarchive_enabled: False
+
+# Minetest is an open source clone of the Minecraft building blocks game
+minetest_install: False
+minetest_enabled: False
+
 # Calibre E-Book Library
 # WARNING: CALIBRE INSTALLS GRAPHICAL LIBRARIES SIMILAR TO X WINDOWS & OPENGL
 # ON (HEADLESS, SERVER, LITE) OS'S THAT DON'T ALREADY HAVE THESE INSTALLED.
@ -350,15 +359,6 @@ calibreweb_url2: /libros    # For SHORT URL http://box/libros (Spanish)
 calibreweb_url3: /livres    # For SHORT URL http://box/livres (French)
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web

-# Internet Archive Decentralized Web - create your own offline version box:4244
-# (or http://box/archive) arising from digital library https://dweb.archive.org
-internetarchive_install: False
-internetarchive_enabled: False
-
-# Minetest is an open source clone of the Minecraft building blocks game
-minetest_install: False
-minetest_enabled: False
-

 # CONSIDER THESE NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD:
 #