diff --git a/roles/osm-vector/tasks/main.yml b/roles/osm-vector/tasks/main.yml index 0351692c9..cf41bc064 100644 --- a/roles/osm-vector/tasks/main.yml +++ b/roles/osm-vector/tasks/main.yml @@ -1,26 +1,26 @@ - name: Fetch the javascript bundle with openlayers module, and map.js get_url: - url: "{{ iiab_maps_url }}/map.js" + url: "{{ iiab_osm_url }}/map.js" dest: "{{ doc_root }}/common/assets/" -- name: Fetch the catalog for maps +- name: Fetch the catalog for osm maps get_url: - url: "{{ iiab_maps_url }}/regions.json" + url: "{{ iiab_osm_url }}/regions.json" dest: "{{ iiab_dir }}/regions.json" -- name: Fetch the bounding box description for maps +- name: Fetch the bounding box description for osm maps get_url: - url: "{{ iiab_maps_url }}/bboxes.geojson" + url: "{{ iiab_osm_url }}/bboxes.geojson" dest: "{{ doc_root }}/common/assets/bboxes.geojson" -- name: Install the script to update maps from map catalog +- name: Install the script to update osm catalog template: - src: iiab-update-maps - dest: /usr/bin/iiab-update-maps + src: iiab-update-osm + dest: /usr/bin/iiab-update-osm mode: "0755" - name: Generate the bounding bboxes.geojson file - shell: /usr/bin/iiab-update-maps + shell: /usr/bin/iiab-update-osm - name: Copy the Countries geojson to assets copy: @@ -53,7 +53,7 @@ group: '{{ apache_user }}' mode: '0755' -- name: Copy the splash page for maps to apache root for maps +- name: Copy the splash page for osm-vector to the apache root for osm template: src: splash-index.html dest: "{{ osm_vector_path }}/splash/index.html" diff --git a/roles/osm-vector/templates/iiab-update-maps b/roles/osm-vector/templates/iiab-update-osm similarity index 100% rename from roles/osm-vector/templates/iiab-update-maps rename to roles/osm-vector/templates/iiab-update-osm diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 2693e7712..2b80b2e8c 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -15,7 +15,7 @@ pip_packages_dir: "{{ iiab_base }}/pip-packages" yum_packages_dir: "{{ iiab_base }}/yum-packages" downloads_dir: "{{ iiab_base }}/downloads" iiab_download_url: http://download.iiab.io/packages -iiab_maps_url : http://download.iiab.io/content/OSM/vector-tiles +iiab_osm_url : http://download.iiab.io/content/OSM/vector-tiles content_base: "/library" doc_base: "{{ content_base }}/www"