diff --git a/roles/2-common/tasks/packages.yml b/roles/2-common/tasks/packages.yml index 771d0f436..6ffc707cd 100644 --- a/roles/2-common/tasks/packages.yml +++ b/roles/2-common/tasks/packages.yml @@ -27,7 +27,7 @@ state: present when: is_debuntu -- name: "Install 22 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3, sudo, tar, unzip, usbutils, wget" +- name: "Install 22 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, pandoc, pastebinit, rsync, sqlite3, tar, unzip, usbutils, wget" package: name: - acpid diff --git a/roles/kalite/defaults/main.yml b/roles/kalite/defaults/main.yml index 5de608d8d..d3f20fbd1 100644 --- a/roles/kalite/defaults/main.yml +++ b/roles/kalite/defaults/main.yml @@ -8,10 +8,8 @@ # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! 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_root: /library/ka-lite kalite_venv: /usr/local/kalite/venv kalite_program: "{{ kalite_venv }}/bin/kalite" diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index dbcd49351..2e58d4516 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -31,22 +31,22 @@ dest: "{{ vector_map_path }}/viewer/cities1000.sqlite" when: not cities_installed.stat.exists -- name: Create a link to osm catalog in /common/assets +- name: Symlink {{ doc_root }}/common/assets/map-catalog.json -> /etc/iiab/map-catalog.json file: src: /etc/iiab/map-catalog.json - dest: "{{ doc_root }}/common/assets/map-catalog.json" # /library/www/html + path: "{{ doc_root }}/common/assets/map-catalog.json" # /library/www/html state: link -- name: Create a link to osm catalog in {{ vector_map_path }}/maplist/assets +- name: Symlink {{ vector_map_path }}/test-page/assets/map-catalog.json -> /etc/iiab/map-catalog.json file: src: /etc/iiab/map-catalog.json - dest: "{{ vector_map_path }}/test-page/assets/map-catalog.json" + path: "{{ vector_map_path }}/test-page/assets/map-catalog.json" state: link -- name: Create a link to regions.json in {{ vector_map_path }}/maplist/assets +- name: Symlink {{ vector_map_path }}/maplist/assets/regions.json -> /etc/iiab/regions.json file: src: /etc/iiab/regions.json - dest: "{{ vector_map_path }}/maplist/assets/regions.json" + path: "{{ vector_map_path }}/maplist/assets/regions.json" state: link - name: Download the JavaScript bundle with OpenLayers (test-page-bundle.js) for test page http://box/maps/maplist @@ -83,16 +83,16 @@ url: "{{ map_catalog_url }}/planet_z0-z6_2019.mbtiles" dest: "{{ vector_map_path }}/installer/" -- name: Create a synlink from tiles to detail.mbtiles +- name: Symlink {{ vector_map_path }}/installer/detail.mbtiles -> {{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles file: src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles" - dest: "{{ vector_map_path }}/installer/detail.mbtiles" + path: "{{ vector_map_path }}/installer/detail.mbtiles" state: link -- name: Link to the World Map to zoom 6 +- name: Symlink {{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles -> {{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles file: src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles" - dest: "{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles" + path: "{{ vector_map_path }}/viewer/tiles/planet_z0-z6_2019.mbtiles" state: link - name: Copy the map abbreviated satellite images @@ -140,17 +140,17 @@ - style-sat.json - view_list.png -- name: Place a link to bboxes.geojson for Admin Console +- name: Symlink {{ vector_map_path }}/maplist/assets/bboxes.geojson -> {{ vector_map_path }}/viewer/assets/bboxes.geojson for Admin Console file: src: "{{ vector_map_path }}/viewer/assets/bboxes.geojson" - dest: "{{ vector_map_path }}/maplist/assets/bboxes.geojson" + path: "{{ vector_map_path }}/maplist/assets/bboxes.geojson" state: link force: True -- name: Place a link to countries.json for Admin Console +- name: Symlink {{ vector_map_path }}/maplist/assets/countries.json -> {{ vector_map_path }}/viewer/assets/countries.json for Admin Console file: src: "{{ vector_map_path }}/viewer/assets/countries.json" - dest: "{{ vector_map_path }}/maplist/assets/countries.json" + path: "{{ vector_map_path }}/maplist/assets/countries.json" state: link force: True diff --git a/roles/usb_lib/README.rst b/roles/usb_lib/README.rst index 1f69bc402..06ae5f1b5 100644 --- a/roles/usb_lib/README.rst +++ b/roles/usb_lib/README.rst @@ -20,6 +20,12 @@ Automount is handled by usbmount, and scripts in this role look in the root of t USB drives must be formatted with one of the filesystems listed under "FILESYSTEMS=" at /etc/usbmount/usbmount.conf -There is also a patch for problems with automount on Fedora 21+ +Official `usbmount `_ documentation, from 2010: -Please Note that as of the 4.1.8-200.fc22.x86_64 not all USB drives will mount even with this patch. +* https://github.com/hfuchs/usbmount/blob/master/README +* https://github.com/hfuchs/usbmount/blob/master/usbmount.conf + +As of March 2021, better Kolibri integration/support is being investigated: `#2713 `_ + +Legacy: There is also a patch for problems with automount on Fedora 21+. +Please Note that as of 4.1.8-200.fc22.x86_64 not all USB drives will mount, even with this patch. diff --git a/scripts/ansible b/scripts/ansible index 57bc906fe..234ee833b 100755 --- a/scripts/ansible +++ b/scripts/ansible @@ -9,7 +9,7 @@ APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint CURR_VER=undefined # Ansible version you currently have installed -GOOD_VER=2.10.6 # Orig for 'yum install [rpm]' & XO laptops (pip install) +GOOD_VER=2.10.7 # Orig for 'yum install [rpm]' & XO laptops (pip install) # We install the latest 'ansible-base' from PPA, using an OS 'CODENAME' below: # https://launchpad.net/~ansible/+archive/ubuntu/ansible @@ -36,13 +36,13 @@ fi # IIAB implementers might instead consider these 3 GENERAL TECHNIQUES below # ("in an emergency!") e.g. if you must install an older version of Ansible: -# TEMPORARILY USE ansible-base 2.10.6 (REMOVE W/ "pip3 uninstall ansible-base") -#pip3 install ansible-base==2.10.6 # Start new shell, so /usr/local/bin works +# TEMPORARILY USE ansible-base 2.10.7 (REMOVE W/ "pip3 uninstall ansible-base") +#pip3 install ansible-base==2.10.7 # Start new shell, so /usr/local/bin works #ansible-galaxy collection install -r collections.yml -# TEMPORARILY USE ANSIBLE 2.9.18 (REMOVE IT WITH "pip uninstall ansible") +# TEMPORARILY USE ANSIBLE 2.9.19 (REMOVE IT WITH "pip uninstall ansible") #apt install python-pip -#pip install ansible==2.9.18 +#pip install ansible==2.9.19 # TEMPORARILY USE ANSIBLE 2.4.2 DUE TO 2.4.3 MEMORY BUG. Details: iiab/iiab#669 #echo "Install http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb"