From 084d0e45b8650960e811d134abc6e3f70a307f96 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 4 Apr 2019 19:24:41 +0100 Subject: [PATCH 1/3] had not included osm-vector in list of roles -- so reinstall did not work --- roles/7-edu-apps/tasks/main.yml | 6 ++++++ roles/osm-vector/tasks/main.yml | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index d3b9e264b..688455ffa 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -27,6 +27,12 @@ when: moodle_install tags: olpc, moodle +- name: OSM_VECTOR + include_role: + name: osm-vector + when: osm_vector_install is defined and osm_vector_install + tags: osm + # UNMAINTAINED - name: OSM include_role: diff --git a/roles/osm-vector/tasks/main.yml b/roles/osm-vector/tasks/main.yml index b74ebc7b6..d52a76362 100644 --- a/roles/osm-vector/tasks/main.yml +++ b/roles/osm-vector/tasks/main.yml @@ -1,8 +1,3 @@ -- name: Fetch the catalog for osm maps - get_url: - url: "{{ iiab_osm_url }}/assets/regions.json" - dest: '{{ osm_vector_path }}/assets' - - name: Make sure the osm-vector directory exists file: path: '{{ osm_vector_path }}/assets' @@ -11,6 +6,11 @@ group: '{{ apache_user }}' mode: '0755' +- name: Fetch the catalog for osm maps + get_url: + url: "{{ iiab_osm_url }}/assets/regions.json" + dest: '{{ osm_vector_path }}/assets' + - name: Fetch the javascript bundle with openlayers for test page get_url: url: "{{ iiab_osm_url }}/assets/main.js" From f0b1767e64f3238030de679aac72186ecbfa4095 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 4 Apr 2019 19:55:32 +0100 Subject: [PATCH 2/3] use html meta redirect --- roles/osm-vector/files/test-index.redirect | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/osm-vector/files/test-index.redirect b/roles/osm-vector/files/test-index.redirect index 0f3eb702e..b026e365a 100644 --- a/roles/osm-vector/files/test-index.redirect +++ b/roles/osm-vector/files/test-index.redirect @@ -1,5 +1,4 @@ - + + + From f3d2bf2450605333866dd80be2fc2e2d9c9b05a7 Mon Sep 17 00:00:00 2001 From: George Hunt Date: Thu, 4 Apr 2019 20:35:28 +0100 Subject: [PATCH 3/3] be more consitent with zim processing --- roles/osm-vector/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/osm-vector/tasks/main.yml b/roles/osm-vector/tasks/main.yml index d52a76362..bdf2fd560 100644 --- a/roles/osm-vector/tasks/main.yml +++ b/roles/osm-vector/tasks/main.yml @@ -11,6 +11,12 @@ url: "{{ iiab_osm_url }}/assets/regions.json" dest: '{{ osm_vector_path }}/assets' +- name: Create a link to osm catalog in /common/assets + file: + src: "{{ osm_vector_path }}/assets/regions.json" + dest: "{{ doc_root }}/common/assets/regions.json" + state: link + - name: Fetch the javascript bundle with openlayers for test page get_url: url: "{{ iiab_osm_url }}/assets/main.js"