From 9910805f06246530f6730ad28adc962d50cd9c5b Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 25 Apr 2022 12:22:01 -0500 Subject: [PATCH 01/12] swing git repo back to iiab/master --- roles/osm-vector-maps/defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml index e32bc6a1c..a0fd7a8be 100644 --- a/roles/osm-vector-maps/defaults/main.yml +++ b/roles/osm-vector-maps/defaults/main.yml @@ -8,10 +8,10 @@ # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! # The following soft coded variables allow testing, before pulling PR's into master -# osm_repo_url: https://raw.githubusercontent.com/iiab/maps -osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps -#maps_branch: 'master' # Quotes not required -maps_branch: 'maps7.3' +osm_repo_url: https://raw.githubusercontent.com/iiab/maps +maps_branch: 'master' # Quotes not required +#osm_repo_url: https://raw.githubusercontent.com/georgejhunt/maps +#maps_branch: 'maps7.3' # soft code sources archive_org_url: https://archive.org/download From 8cd11af3d5d260da39f9df8f50b93d5a0e74facb Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 25 Apr 2022 12:46:14 -0500 Subject: [PATCH 02/12] swing regions.json to iiab/master --- roles/osm-vector-maps/tasks/install.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 3bb9e5176..5632c4083 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -16,12 +16,6 @@ dest: "{{ iiab_etc_path }}" # /etc/iiab timeout: "{{ download_timeout }}" -- name: Download {{ iiab_map_url }}/assets/regions.json to {{ iiab_etc_path }} - get_url: - url: "{{ iiab_map_url }}/assets/regions.json" # http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden - dest: "{{ iiab_etc_path }}" - timeout: "{{ download_timeout }}" - # - name: Does 26M cities database {{ vector_map_path }}/viewer/cities1000.sqlite exist? # stat: # path: "{{ vector_map_path }}/viewer/cities1000.sqlite" @@ -35,6 +29,13 @@ timeout: "{{ download_timeout }}" # when: not cities_installed.stat.exists +# At this point, fetches from github.com/georgejhunt/maps from test branch +- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json to {{ iiab_etc_path }} + get_url: + url: "{{ osm_repo_url }}/master/resources/regions.json" + dest: "{{ iiab_etc_path }}" + timeout: "{{ download_timeout }}" + - name: Symlink {{ doc_root }}/common/assets/map-catalog.json -> /etc/iiab/map-catalog.json file: src: /etc/iiab/map-catalog.json @@ -53,7 +54,6 @@ path: "{{ vector_map_path }}/maplist/assets/regions.json" state: link -# At this point, fetches from github.com/georgejhunt/maps from test branch - name: Download OpenLayers test page stuff (JavaScript bundle etc) from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/* to {{ vector_map_path }}/test-page/ -- for test page http://box/osm-vector-maps/installer/ get_url: url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/{{ item }}" # https://raw.githubusercontent.com/iiab/maps / master From 17ce6e4fb4ea7adf06a8370266487fcbbf064c30 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 25 Apr 2022 13:51:40 -0500 Subject: [PATCH 03/12] notes & to be fixed --- roles/osm-vector-maps/tasks/install.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 5632c4083..8f4c863fe 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -10,12 +10,6 @@ - "{{ vector_map_path }}/viewer/tiles" - "{{ vector_map_path }}/installer" -- name: Download {{ map_catalog_url }}/map-catalog.json to {{ iiab_etc_path }} - get_url: - url: "{{ map_catalog_url }}/map-catalog.json" # http://download.iiab.io/content/OSM/vector-tiles - dest: "{{ iiab_etc_path }}" # /etc/iiab - timeout: "{{ download_timeout }}" - # - name: Does 26M cities database {{ vector_map_path }}/viewer/cities1000.sqlite exist? # stat: # path: "{{ vector_map_path }}/viewer/cities1000.sqlite" @@ -29,11 +23,10 @@ timeout: "{{ download_timeout }}" # when: not cities_installed.stat.exists -# At this point, fetches from github.com/georgejhunt/maps from test branch -- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json to {{ iiab_etc_path }} +- name: Download {{ map_catalog_url }}/map-catalog.json to {{ iiab_etc_path }} get_url: - url: "{{ osm_repo_url }}/master/resources/regions.json" - dest: "{{ iiab_etc_path }}" + url: "{{ map_catalog_url }}/map-catalog.json" # http://timmoody.com/iiab-files/maps + dest: "{{ iiab_etc_path }}" # /etc/iiab timeout: "{{ download_timeout }}" - name: Symlink {{ doc_root }}/common/assets/map-catalog.json -> /etc/iiab/map-catalog.json @@ -48,12 +41,23 @@ path: "{{ vector_map_path }}/test-page/assets/map-catalog.json" state: link +# regions.json is out of sync atm.. +#- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json to {{ iiab_etc_path }} +# get_url: {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json + +- name: Download {{ iiab_map_url }}/assets/regions.json to {{ iiab_etc_path }} + get_url: + url: "{{ iiab_map_url }}/assets/regions.json" + dest: "{{ iiab_etc_path }}" + timeout: "{{ download_timeout }}" + - name: Symlink {{ vector_map_path }}/maplist/assets/regions.json -> /etc/iiab/regions.json file: src: /etc/iiab/regions.json path: "{{ vector_map_path }}/maplist/assets/regions.json" state: link +# At this point, fetches from github.com/'REPO'/maps from maps_branch - name: Download OpenLayers test page stuff (JavaScript bundle etc) from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/* to {{ vector_map_path }}/test-page/ -- for test page http://box/osm-vector-maps/installer/ get_url: url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/{{ item }}" # https://raw.githubusercontent.com/iiab/maps / master From 6a8d50aabcc6f701b88dc11bff652fe71c677806 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 25 Apr 2022 22:52:44 -0500 Subject: [PATCH 04/12] move apt install --- roles/osm-vector-maps/tasks/install.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 8f4c863fe..b14c58630 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -10,6 +10,16 @@ - "{{ vector_map_path }}/viewer/tiles" - "{{ vector_map_path }}/installer" +- name: "Install packages for map installation: python3-geojson, python3-pil, python3-wget, php{{ php_version }}-sqlite3 (can also be installed by www_base/tasks/php-stem.yml)" + package: + state: present + name: + - python3-geojson + - python3-pil + - python3-wget + #- php{{ php_version }}-common # Auto-installed as an apt dependency. REGARDLESS: php{{ php_version }}-common superset php{{ php_version }}-cli is auto-installed by php{{ php_version }}-fpm in nginx/tasks/install.yml + - php{{ php_version }}-sqlite3 + # - name: Does 26M cities database {{ vector_map_path }}/viewer/cities1000.sqlite exist? # stat: # path: "{{ vector_map_path }}/viewer/cities1000.sqlite" @@ -187,16 +197,6 @@ force: yes timeout: "{{ download_timeout }}" -- name: "Install packages for map installation: python3-geojson, python3-pil, python3-wget, php{{ php_version }}-sqlite3 (can also be installed by www_base/tasks/php-stem.yml)" - package: - state: present - name: - - python3-geojson - - python3-pil - - python3-wget - #- php{{ php_version }}-common # Auto-installed as an apt dependency. REGARDLESS: php{{ php_version }}-common superset php{{ php_version }}-cli is auto-installed by php{{ php_version }}-fpm in nginx/tasks/install.yml - - php{{ php_version }}-sqlite3 - - name: Copy 6 scripts to /usr/bin, for downloading tiles (0755) get_url: url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/viewer/scripts/{{ item }}" From 73d912fb4c4868bcee66039a98153e4f922e43e6 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Mon, 25 Apr 2022 23:29:51 -0500 Subject: [PATCH 05/12] swing to osm_repo_url --- roles/osm-vector-maps/tasks/install.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index b14c58630..61c3c7e25 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -26,16 +26,16 @@ # register: cities_installed # - name: If not, download {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ -- name: Download 26M {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ +- name: Download 26M {{ osm_repo_url }}/{{ maps_branch }}/resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ get_url: - url: "{{ iiab_map_url }}/regional-resources/cities1000.sqlite" + url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/cities1000.sqlite" dest: "{{ vector_map_path }}/viewer/" timeout: "{{ download_timeout }}" # when: not cities_installed.stat.exists -- name: Download {{ map_catalog_url }}/map-catalog.json to {{ iiab_etc_path }} +- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/map-catalog.json to {{ iiab_etc_path }} get_url: - url: "{{ map_catalog_url }}/map-catalog.json" # http://timmoody.com/iiab-files/maps + url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/map-catalog.json" dest: "{{ iiab_etc_path }}" # /etc/iiab timeout: "{{ download_timeout }}" @@ -51,13 +51,9 @@ path: "{{ vector_map_path }}/test-page/assets/map-catalog.json" state: link -# regions.json is out of sync atm.. -#- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json to {{ iiab_etc_path }} -# get_url: {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json - -- name: Download {{ iiab_map_url }}/assets/regions.json to {{ iiab_etc_path }} +- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json to {{ iiab_etc_path }} get_url: - url: "{{ iiab_map_url }}/assets/regions.json" + url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json" dest: "{{ iiab_etc_path }}" timeout: "{{ download_timeout }}" From 4ea85bc52526e262f5d3f972cb9c5b32be0c06f6 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 26 Apr 2022 00:03:15 -0500 Subject: [PATCH 06/12] swing note --- roles/osm-vector-maps/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 61c3c7e25..028d98518 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -26,6 +26,7 @@ # register: cities_installed # - name: If not, download {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ +# At this point, fetches from github.com/'REPO'/maps from maps_branch - name: Download 26M {{ osm_repo_url }}/{{ maps_branch }}/resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ get_url: url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/cities1000.sqlite" @@ -63,7 +64,6 @@ path: "{{ vector_map_path }}/maplist/assets/regions.json" state: link -# At this point, fetches from github.com/'REPO'/maps from maps_branch - name: Download OpenLayers test page stuff (JavaScript bundle etc) from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/* to {{ vector_map_path }}/test-page/ -- for test page http://box/osm-vector-maps/installer/ get_url: url: "{{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/{{ item }}" # https://raw.githubusercontent.com/iiab/maps / master From 0c5e477653890f0c79c547d68c2bfc6ba498a61e Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 26 Apr 2022 00:13:04 -0500 Subject: [PATCH 07/12] default_vars --- roles/osm-vector-maps/defaults/main.yml | 1 + vars/default_vars.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml index a0fd7a8be..5046e2162 100644 --- a/roles/osm-vector-maps/defaults/main.yml +++ b/roles/osm-vector-maps/defaults/main.yml @@ -15,6 +15,7 @@ maps_branch: 'master' # Quotes not required # soft code sources archive_org_url: https://archive.org/download +iiab_map_url: http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden #map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles map_catalog_url: http://timmoody.com/iiab-files/maps satellite_version: satellite_z0-z9_v3.mbtiles # 2021-12-20: Var unused, but hard-coded in 11 places within https://github.com/iiab/iiab-admin-console -- #3077 discusses map-catalog.json & adm-map-catalog.json diff --git a/vars/default_vars.yml b/vars/default_vars.yml index ca4fc9d98..5956a325d 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -488,7 +488,9 @@ osm_vector_maps_install: True osm_vector_maps_enabled: False # Set to "True" to download .mbtiles files from Archive.org (might be slow!) maps_from_internet_archive: False -iiab_map_url : http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden +osm_repo_url: https://raw.githubusercontent.com/iiab/maps +maps_branch: master # Quotes not required + vector_map_path: "{{ content_base }}/www/osm-vector-maps" # /library/www/osm-vector-maps # MongoDB (/library/dbdata/mongodb) greatly enhances the Sugarizer experience. From 2df70d5555dfe4a10102896644da3536c4b11766 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 26 Apr 2022 00:20:32 -0500 Subject: [PATCH 08/12] s/b disabled --- roles/osm-vector-maps/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm-vector-maps/defaults/main.yml b/roles/osm-vector-maps/defaults/main.yml index 5046e2162..5801e0773 100644 --- a/roles/osm-vector-maps/defaults/main.yml +++ b/roles/osm-vector-maps/defaults/main.yml @@ -15,7 +15,7 @@ maps_branch: 'master' # Quotes not required # soft code sources archive_org_url: https://archive.org/download -iiab_map_url: http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden +#iiab_map_url: http://download.iiab.io/content/OSM/vector-tiles/maplist/hidden #map_catalog_url: http://download.iiab.io/content/OSM/vector-tiles map_catalog_url: http://timmoody.com/iiab-files/maps satellite_version: satellite_z0-z9_v3.mbtiles # 2021-12-20: Var unused, but hard-coded in 11 places within https://github.com/iiab/iiab-admin-console -- #3077 discusses map-catalog.json & adm-map-catalog.json From be07caca707a79d1def686b0c7ae581d7593735f Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 26 Apr 2022 13:56:16 -0500 Subject: [PATCH 09/12] regions.json went away https://github.com/iiab/maps/issues/55#issuecomment-1110136033 --- roles/osm-vector-maps/tasks/install.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 028d98518..ffe026695 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -52,17 +52,17 @@ path: "{{ vector_map_path }}/test-page/assets/map-catalog.json" state: link -- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json to {{ iiab_etc_path }} - get_url: - url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json" - dest: "{{ iiab_etc_path }}" - timeout: "{{ download_timeout }}" +#- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json to {{ iiab_etc_path }} +# get_url: +# url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/regions.json" +# dest: "{{ iiab_etc_path }}" +# timeout: "{{ download_timeout }}" -- name: Symlink {{ vector_map_path }}/maplist/assets/regions.json -> /etc/iiab/regions.json - file: - src: /etc/iiab/regions.json - path: "{{ vector_map_path }}/maplist/assets/regions.json" - state: link +#- name: Symlink {{ vector_map_path }}/maplist/assets/regions.json -> /etc/iiab/regions.json +# file: +# src: /etc/iiab/regions.json +# path: "{{ vector_map_path }}/maplist/assets/regions.json" +# state: link - name: Download OpenLayers test page stuff (JavaScript bundle etc) from {{ osm_repo_url }}/{{ maps_branch }}/osm-source/pages/test-page/build/* to {{ vector_map_path }}/test-page/ -- for test page http://box/osm-vector-maps/installer/ get_url: From 6e657d593aadfa9eb3e9c5d809c890e3e451692a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 27 Apr 2022 12:21:39 -0500 Subject: [PATCH 10/12] use new path --- roles/osm-vector-maps/tasks/install.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index ffe026695..f20a99a7f 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -27,16 +27,16 @@ # - name: If not, download {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ # At this point, fetches from github.com/'REPO'/maps from maps_branch -- name: Download 26M {{ osm_repo_url }}/{{ maps_branch }}/resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ +- name: Download 26M {{ osm_repo_url }}/{{ maps_branch }}/2022/cities1000.sqlite to {{ vector_map_path }}/viewer/ get_url: - url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/cities1000.sqlite" + url: "{{ osm_repo_url }}/{{ maps_branch }}/2022/cities1000.sqlite" dest: "{{ vector_map_path }}/viewer/" timeout: "{{ download_timeout }}" # when: not cities_installed.stat.exists -- name: Download {{ osm_repo_url }}/{{ maps_branch }}/resources/map-catalog.json to {{ iiab_etc_path }} +- name: Download {{ osm_repo_url }}/{{ maps_branch }}/2022/map-catalog.json to {{ iiab_etc_path }} get_url: - url: "{{ osm_repo_url }}/{{ maps_branch }}/resources/map-catalog.json" + url: "{{ osm_repo_url }}/{{ maps_branch }}/2022/map-catalog.json" dest: "{{ iiab_etc_path }}" # /etc/iiab timeout: "{{ download_timeout }}" From 1049d94d4c35875974d84b32f8eafc67a532e7e3 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 28 Apr 2022 06:24:42 -0500 Subject: [PATCH 11/12] use new path2 --- roles/osm-vector-maps/tasks/install.yml | 8 ++++---- vars/default_vars.yml | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index f20a99a7f..9c304c88c 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -27,16 +27,16 @@ # - name: If not, download {{ iiab_map_url }}/regional-resources/cities1000.sqlite to {{ vector_map_path }}/viewer/ # At this point, fetches from github.com/'REPO'/maps from maps_branch -- name: Download 26M {{ osm_repo_url }}/{{ maps_branch }}/2022/cities1000.sqlite to {{ vector_map_path }}/viewer/ +- name: Download 26M {{ osm_repo_url }}/{{ maps_branch }}/2020/cities1000.sqlite to {{ vector_map_path }}/viewer/ get_url: - url: "{{ osm_repo_url }}/{{ maps_branch }}/2022/cities1000.sqlite" + url: "{{ osm_repo_url }}/{{ maps_branch }}/2020/cities1000.sqlite" dest: "{{ vector_map_path }}/viewer/" timeout: "{{ download_timeout }}" # when: not cities_installed.stat.exists -- name: Download {{ osm_repo_url }}/{{ maps_branch }}/2022/map-catalog.json to {{ iiab_etc_path }} +- name: Download {{ osm_repo_url }}/{{ maps_branch }}/2020/map-catalog.json to {{ iiab_etc_path }} get_url: - url: "{{ osm_repo_url }}/{{ maps_branch }}/2022/map-catalog.json" + url: "{{ osm_repo_url }}/{{ maps_branch }}/2020/map-catalog.json" dest: "{{ iiab_etc_path }}" # /etc/iiab timeout: "{{ download_timeout }}" diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 5956a325d..bba0ad763 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -488,9 +488,6 @@ osm_vector_maps_install: True osm_vector_maps_enabled: False # Set to "True" to download .mbtiles files from Archive.org (might be slow!) maps_from_internet_archive: False -osm_repo_url: https://raw.githubusercontent.com/iiab/maps -maps_branch: master # Quotes not required - vector_map_path: "{{ content_base }}/www/osm-vector-maps" # /library/www/osm-vector-maps # MongoDB (/library/dbdata/mongodb) greatly enhances the Sugarizer experience. From a784d5ec2758518e052b70d7d7e05e7546912063 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Thu, 28 Apr 2022 08:57:38 -0500 Subject: [PATCH 12/12] install fonts to '/viewer/assets/' --- roles/osm-vector-maps/tasks/install.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/osm-vector-maps/tasks/install.yml b/roles/osm-vector-maps/tasks/install.yml index 9c304c88c..0989ead7f 100644 --- a/roles/osm-vector-maps/tasks/install.yml +++ b/roles/osm-vector-maps/tasks/install.yml @@ -176,10 +176,10 @@ state: link force: yes -- name: Copy fonts (16 files) to {{ doc_root }}/common/fonts/ for the general purpose map viewer (root:root, 0644 by default) +- name: Copy fonts (16 files) to {{ vector_map_path }}/viewer/assets/ for the general purpose map viewer (root:root, 0644 by default) copy: src: "{{ item }}" - dest: "{{ doc_root }}/common/fonts/" + dest: "{{ vector_map_path }}/viewer/assets/" # mode: 0644 # owner: root # group: root