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 branch 'iiab:master' into master

Browse source
This commit is contained in:
Josué Acevedo (Neomatrix) 2023-05-15 23:49:41 -06:00 • committed by GitHub
commit bc3fba6b22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
roles/kiwix/tasks/install.yml
View file

@ -24,7 +24,17 @@
url: https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-armhf-3.4.0.tar.gz url: https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-armhf-3.4.0.tar.gz
dest: "{{ downloads_dir }}" dest: "{{ downloads_dir }}"
timeout: "{{ download_timeout }}" timeout: "{{ download_timeout }}"
register: kiwix_dl #register: kiwix_dl # CLOBBERS kiwix_dl.dest WHEN THIS STANZA DOES NOT RUN :/
when: kiwix_dl.dest == "/opt/iiab/downloads/kiwix-tools_linux-armhf-3.5.0.tar.gz"
# Ansible does not allow changing individuals subfields in a dictionary, but
# this crude hack works, overwriting the entire kiwix_dl dictionary var with
# the single (needed) key/value pair. (Or "register: tmp_dl" could be set
# above, if its other [subfields, key/value pairs, etc] really mattered...)
- name: "2023-05-15: TEMPORARY PATCH REVERTING TO KIWIX-TOOLS 3.4.0 IF BUGGY 32-BIT (armhf) VERSION 3.5.0 IS DETECTED -- #3574"
set_fact:
kiwix_dl:
dest: /opt/iiab/downloads/kiwix-tools_linux-armhf-3.4.0.tar.gz
when: kiwix_dl.dest == "/opt/iiab/downloads/kiwix-tools_linux-armhf-3.5.0.tar.gz" when: kiwix_dl.dest == "/opt/iiab/downloads/kiwix-tools_linux-armhf-3.5.0.tar.gz"
- name: Does {{ kiwix_path }}/bin already exist? (as a directory, symlink or file) - name: Does {{ kiwix_path }}/bin already exist? (as a directory, symlink or file)

5
scripts/local_facts.fact
View file

@ -113,8 +113,9 @@ tmp=$(git rev-parse --verify HEAD) &&
IIAB_COMMIT=$tmp IIAB_COMMIT=$tmp
grep -iq raspberry /proc/device-tree/model && grep -iq raspberry /proc/cpuinfo &&
RPI_MODEL=$(grep -ai raspberry /proc/device-tree/model | tr -d '\0') RPI_MODEL=$(grep -i raspberry /proc/cpuinfo | sed 's/.*: //')
#RPI_MODEL=$(grep -ai raspberry /proc/device-tree/model | tr -d '\0')
# /proc/device-tree/model e.g. 'Parallels ARM Virtual Machine' identical to... # /proc/device-tree/model e.g. 'Parallels ARM Virtual Machine' identical to...
# /sys/firmware/devicetree/base/model (also true on RPi hardware!) # /sys/firmware/devicetree/base/model (also true on RPi hardware!)

2
vars/default_vars.yml
View file

@ -502,7 +502,7 @@ kiwix_apk_src: https://download.kiwix.org/release/kiwix-android/kiwix.apk
postgresql_install: False postgresql_install: False
postgresql_enabled: False postgresql_enabled: False
# Warning: Moodle is a serious LMS, that takes a while to install. # Warning: Moodle is a serious LMS, that takes a while to install
moodle_install: False moodle_install: False
moodle_enabled: False moodle_enabled: False
# FYI 'nginx_high_php_limits: True' (explained above) is mandated with Moodle, # FYI 'nginx_high_php_limits: True' (explained above) is mandated with Moodle,

2
vars/local_vars_small.yml
View file

@ -295,7 +295,7 @@ kolibri_language: en # ar,bg-bg,bn-bd,de,el,en,es-es,es-419,fa,fr-fr,ff-cm,gu
kiwix_install: True kiwix_install: True
kiwix_enabled: True kiwix_enabled: True
# Warning: Moodle is a serious LMS, that takes a while to install. # Warning: Moodle is a serious LMS, that takes a while to install
moodle_install: False moodle_install: False
moodle_enabled: False moodle_enabled: False
# FYI 'nginx_high_php_limits: True' (explained above) is mandated with Moodle, # FYI 'nginx_high_php_limits: True' (explained above) is mandated with Moodle,

2
vars/local_vars_unittest.yml
View file

@ -295,7 +295,7 @@ kolibri_language: en # ar,bg-bg,bn-bd,de,el,en,es-es,es-419,fa,fr-fr,ff-cm,gu
kiwix_install: False kiwix_install: False
kiwix_enabled: False kiwix_enabled: False
# Warning: Moodle is a serious LMS, that takes a while to install. # Warning: Moodle is a serious LMS, that takes a while to install
moodle_install: False moodle_install: False
moodle_enabled: False moodle_enabled: False
# FYI 'nginx_high_php_limits: True' (explained above) is mandated with Moodle, # FYI 'nginx_high_php_limits: True' (explained above) is mandated with Moodle,