From 48503c6a8297af8147141421c169100eeb0dd975 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:42:05 -0400 Subject: [PATCH 1/4] Python path: /usr/local/osm//... -> /usr/local/osm/... --- roles/osm/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/osm/tasks/main.yml b/roles/osm/tasks/main.yml index a9ed97c62..83a2840c4 100644 --- a/roles/osm/tasks/main.yml +++ b/roles/osm/tasks/main.yml @@ -87,12 +87,14 @@ - name: Set osm_path (redhat) set_fact: - osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" + #osm_path: "{{ osm_venv }}/{{ python_path }}/iiab" + osm_path: "{{ osm_venv }}{{ python_path }}/iiab" when: osm_enabled and is_redhat - name: Set osm_path (debuntu) set_fact: - osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" + #osm_path: "{{ osm_venv }}/lib/python2.7/site-packages/iiab" + osm_path: "{{ osm_venv }}lib/python2.7/site-packages/iiab" when: osm_enabled and is_debuntu - name: Point wsgi to virtual environment (all OS's) From 3cdbccf5346b900318baff0dc9c952ec2190284b Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 14:46:13 -0400 Subject: [PATCH 2/4] Update osm.conf.j2 --- roles/osm/templates/osm.conf.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/osm/templates/osm.conf.j2 b/roles/osm/templates/osm.conf.j2 index 317648208..735d3d765 100644 --- a/roles/osm/templates/osm.conf.j2 +++ b/roles/osm/templates/osm.conf.j2 @@ -5,9 +5,12 @@ XSendFilePath / WSGIScriptAlias /iiab {{ doc_root }}/osm.wsgi +# For old bitmap/raster tileset Alias /iiabstatic {{ osm_path }}/static Alias /osm {{ osm_path }}/static -Alias /maps {{ osm_path }}/static + +# For new vector tileset, as documents @ http://download.iiab.io/content/OSM/vector-tiles/ +Alias /maps /library/www/html/modules/en-osm-omt-min/ require all granted From cc71985bc402249a5b3576a935fb286d313a8c70 Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 15:08:55 -0400 Subject: [PATCH 3/4] Update osm.conf.j2 --- roles/osm/templates/osm.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm/templates/osm.conf.j2 b/roles/osm/templates/osm.conf.j2 index 735d3d765..806c03305 100644 --- a/roles/osm/templates/osm.conf.j2 +++ b/roles/osm/templates/osm.conf.j2 @@ -7,10 +7,10 @@ WSGIScriptAlias /iiab {{ doc_root }}/osm.wsgi # For old bitmap/raster tileset Alias /iiabstatic {{ osm_path }}/static -Alias /osm {{ osm_path }}/static # For new vector tileset, as documents @ http://download.iiab.io/content/OSM/vector-tiles/ Alias /maps /library/www/html/modules/en-osm-omt-min/ +Alias /osm /library/www/html/modules/en-osm-omt-min/ require all granted From eb26b93490c35a6c837ef78fc343c6b4e86b68df Mon Sep 17 00:00:00 2001 From: A Holt Date: Thu, 30 Aug 2018 15:12:11 -0400 Subject: [PATCH 4/4] Update osm.conf.j2 --- roles/osm/templates/osm.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/osm/templates/osm.conf.j2 b/roles/osm/templates/osm.conf.j2 index 806c03305..dea0ab4e2 100644 --- a/roles/osm/templates/osm.conf.j2 +++ b/roles/osm/templates/osm.conf.j2 @@ -8,7 +8,7 @@ WSGIScriptAlias /iiab {{ doc_root }}/osm.wsgi # For old bitmap/raster tileset Alias /iiabstatic {{ osm_path }}/static -# For new vector tileset, as documents @ http://download.iiab.io/content/OSM/vector-tiles/ +# For new vector tileset, as documented @ http://FAQ.IIAB.IO ("How do I add zoomable maps for my region? ") & http://download.iiab.io/content/OSM/vector-tiles/ Alias /maps /library/www/html/modules/en-osm-omt-min/ Alias /osm /library/www/html/modules/en-osm-omt-min/