From 916fad85887517530b91f08568bd379865144966 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 18 May 2019 19:11:57 -0400 Subject: [PATCH 1/2] default_vars.yml readability --- vars/default_vars.yml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 1838114aa..032388990 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -217,10 +217,6 @@ dansguardian_enabled: False postgresql_install: False postgresql_enabled: False -# Unmaintained -# authserver_install: False -# authserver_enabled: False - # Common UNIX Printing System (CUPS) cups_install: False cups_enabled: False @@ -470,6 +466,13 @@ minetest_default_game: carbone-ng # only carbone-ng and minetest are supporte minetest_flat_world: False +# ============================================================================= +# UNMAINTAINED LEGACY VARIABLES: YOU'RE TAKING BIG RISKS IF YOU USE ANY HERE... + +# Unmaintained +# authserver_install: False +# authserver_enabled: False + # CONSIDER THESE 2 NEW OPENSTREETMAP (OSM) APPROACHES INSTEAD, AS OF 2018: # - http://download.iiab.io/content/OSM/vector-tiles/ # - http://oer2go.org/viewmod/en-worldmap-10 @@ -534,13 +537,14 @@ minetest_flat_world: False # rachel_content_found: False # #rachel_url: /rachel # rachel_doc_root: "{{ doc_root }}/modules" +# ============================================================================= -# ================================================================ -# Platforms - turn all off and let /opt/iiab/iiab/vars/.yml turn on as appropriate +# PLATFORMS: +# TURN ALL OFF AND LET /opt/iiab/iiab/vars/.yml TURN ON AS APPROPRIATE... # Wide to narrow (insofar as poss) -is_debuntu: False # covers all 3: Ubuntu, Debian, Raspbian +is_debuntu: False # Covers all 3: Ubuntu, Debian, Raspbian is_ubuntu: False is_ubuntu_19: False @@ -548,18 +552,18 @@ is_ubuntu_18: False is_ubuntu_17: False is_ubuntu_16: False -is_debian: False # covers both: Debian, Raspbian +is_debian: False # Covers both: Debian, Raspbian is_debian_10: False is_debian_9: False is_debian_8: False -is_raspbian: False # covers RPi HW and non-RPi HW versions of Raspbian +is_raspbian: False # Covers RPi HW and non-RPi HW versions of Raspbian is_raspbian_10: False is_raspbian_9: False is_raspbian_8: False -is_rpi: False # 2019-03-23 - doesn't yet test for RPi HW, but hopefully soon: https://github.com/iiab/iiab/issues/1406 +is_rpi: False # 2019-03-23: Doesn't yet test for RPi HW, but hopefully soon: https://github.com/iiab/iiab/issues/1406 -is_redhat: False # not well supported as of 2019, see: https://github.com/iiab/iiab/issues/1434 +is_redhat: False # Not well supported as of 2019, see: https://github.com/iiab/iiab/issues/1434 is_centos: False is_centos_7: False is_fedora: False From 867828055149a1122743a67add2070b0bc9b9293 Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sun, 19 May 2019 12:53:55 -0400 Subject: [PATCH 2/2] various fixes --- roles/7-edu-apps/tasks/main.yml | 6 +++--- roles/osm-vector-maps/tasks/main.yml | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 688455ffa..4d3db3278 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -27,10 +27,10 @@ when: moodle_install tags: olpc, moodle -- name: OSM_VECTOR +- name: OSM_VECTOR_MAPS include_role: - name: osm-vector - when: osm_vector_install is defined and osm_vector_install + name: osm-vector-maps + when: osm_vector_maps_install tags: osm # UNMAINTAINED diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index ca3cd9276..a16962f8b 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/roles/osm-vector-maps/tasks/main.yml @@ -1,5 +1,5 @@ - name: Make sure the osm-vector-maps directory exists - file: + file: path: '{{ vector_map_path }}/maplist/assets' state: directory owner: '{{ apache_user }}' @@ -45,17 +45,18 @@ dest: /usr/bin/iiab-update-map mode: "0755" -- name: Run the script that does osm-vector-maps housekeeping - shell: /usr/bin/iiab-update-map - +# This depends on iiab-admin-console which is not yet installed +#- name: Run the script that does osm-vector-maps housekeeping +# shell: /usr/bin/iiab-update-map + - name: Copy the Countries geojson to assets - copy: + copy: src: countries.json dest: '{{ vector_map_path }}/maplist/assets' # It is too complicated to use a single file for both iiab and admin-console - name: Copy the duplicated javascript to assets - copy: + copy: src: map_functions.js dest: '{{ vector_map_path }}/maplist/assets' @@ -78,7 +79,7 @@ when: not osm_vector_maps_enabled and is_debuntu - name: Copy the redirect to the test page -- delete this if more than one map - copy: + copy: src: test-index.redirect dest: "{{ vector_map_path }}/index.html"