external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #470 from iiab/master

Browse source 
Sync from iiab/iiab:master
This commit is contained in:
A Holt 2021-03-20 14:26:28 -04:00 • committed by GitHub
commit 8080450d68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/2-common/tasks/packages.yml
View file

@ -27,7 +27,7 @@
state: present state: present
when: is_debuntu 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: package:
name: name:
- acpid - acpid

2
roles/kalite/defaults/main.yml
View file

@ -8,10 +8,8 @@
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
kalite_version: 0.17.5 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_requirements: https://raw.githubusercontent.com/learningequality/ka-lite/master/requirements.txt
kalite_root: /library/ka-lite
kalite_venv: /usr/local/kalite/venv kalite_venv: /usr/local/kalite/venv
kalite_program: "{{ kalite_venv }}/bin/kalite" kalite_program: "{{ kalite_venv }}/bin/kalite"

28
roles/osm-vector-maps/tasks/install.yml
View file

@ -31,22 +31,22 @@
dest: "{{ vector_map_path }}/viewer/cities1000.sqlite" dest: "{{ vector_map_path }}/viewer/cities1000.sqlite"
when: not cities_installed.stat.exists 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: file:
src: /etc/iiab/map-catalog.json 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 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: file:
src: /etc/iiab/map-catalog.json 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 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: file:
src: /etc/iiab/regions.json src: /etc/iiab/regions.json
dest: "{{ vector_map_path }}/maplist/assets/regions.json" path: "{{ vector_map_path }}/maplist/assets/regions.json"
state: link state: link
- name: Download the JavaScript bundle with OpenLayers (test-page-bundle.js) for test page http://box/maps/maplist - 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" url: "{{ map_catalog_url }}/planet_z0-z6_2019.mbtiles"
dest: "{{ vector_map_path }}/installer/" 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: file:
src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles" 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 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: file:
src: "{{ vector_map_path }}/installer/planet_z0-z6_2019.mbtiles" 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 state: link
- name: Copy the map abbreviated satellite images - name: Copy the map abbreviated satellite images
@ -140,17 +140,17 @@
- style-sat.json - style-sat.json
- view_list.png - 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: file:
src: "{{ vector_map_path }}/viewer/assets/bboxes.geojson" 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 state: link
force: True 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: file:
src: "{{ vector_map_path }}/viewer/assets/countries.json" 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 state: link
force: True force: True

10
roles/usb_lib/README.rst
View file

@ -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 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 <https://github.com/hfuchs/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 <https://github.com/iiab/iiab/issues/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.

10
scripts/ansible
View file

@ -9,7 +9,7 @@
APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint APT_PATH=/usr/bin # Avoids problematic /usr/local/bin/apt on Linux Mint
CURR_VER=undefined # Ansible version you currently have installed 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: # We install the latest 'ansible-base' from PPA, using an OS 'CODENAME' below:
# https://launchpad.net/~ansible/+archive/ubuntu/ansible # https://launchpad.net/~ansible/+archive/ubuntu/ansible
@ -36,13 +36,13 @@ fi
# IIAB implementers might instead consider these 3 GENERAL TECHNIQUES below # IIAB implementers might instead consider these 3 GENERAL TECHNIQUES below
# ("in an emergency!") e.g. if you must install an older version of Ansible: # ("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") # TEMPORARILY USE ansible-base 2.10.7 (REMOVE W/ "pip3 uninstall ansible-base")
#pip3 install ansible-base==2.10.6 # Start new shell, so /usr/local/bin works #pip3 install ansible-base==2.10.7 # Start new shell, so /usr/local/bin works
#ansible-galaxy collection install -r collections.yml #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 #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 # 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" #echo "Install http://download.iiab.io/packages/ansible_2.4.2.0-1ppa~xenial_all.deb"