1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

osm-vector-maps/README.md & osm_vector_maps_enabled experiment for IIAB 7.2 RC2

This commit is contained in:
root 2020-09-29 22:52:20 -04:00
parent 65611c60c9
commit 2fae6b0dd8
4 changed files with 25 additions and 10 deletions

View file

@ -192,7 +192,8 @@
- iiab-make-init.py
- iiab-update-map
# nginx.yml handles this, right?
# nginx.yml handles this. Please see discussion/question in tasks/nginx.yml
#
#- name: Install /etc/nginx/osm-vector-maps-nginx.conf from template
# template:
# src: osm-vector-maps-nginx.conf.j2

View file

@ -18,7 +18,7 @@
- name: Enable/Disable/Reload NGINX for OSM, if nginx_enabled
include_tasks: nginx.yml
#when: nginx_enabled | bool
#when: nginx_enabled | bool # NGINX is mandatory starting with IIAB 7.2
- name: Add 'osm-vector-maps' variable values to {{ iiab_ini_file }}

View file

@ -2,14 +2,26 @@
template:
src: osm-vector-maps-nginx.conf.j2
dest: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" # /etc/nginx/conf.d
when: osm_vector_maps_install | bool
when: osm_vector_maps_enabled | bool
#when: osm_vector_maps_install | bool
# Note that the above change from enabled->install is required by the OSM command line installer
# 2020-09-29: @georgejhunt can u explain more the PR #2486 comment just above ?
#
# osm_vector_maps_install is _always_ true here, so doesn't serve a purpose in
# when: conditions. What underlying issue are we trying to solve? If this is
# to enable a functioning world map to zoom level 7-or-10, can we be honest in
# saying "enablement" IS essentially required...in most/all situations? @holta
#
# SEE: #2484, PR #2486, #2487 mentioned @ roles/osm-vector-maps/README.md
- name: Disable http://box/maps & http://box/osm-vector-maps via NGINX, by removing {{ nginx_conf_dir }}/osm-vector-maps-nginx.conf
file:
path: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" # /etc/nginx/conf.d
state: absent
when: not osm_vector_maps_install
when: not osm_vector_maps_enabled
#when: not osm_vector_maps_install
- name: Reload 'nginx' systemd service
systemd: