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"