From ff9cbf68f2cc6988ca158cf37a020c8c825aa515 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 May 2019 13:27:47 -0400 Subject: [PATCH 1/3] Move osm-vector-maps install to 7-edu-apps stage ? --- roles/4-server-options/tasks/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/roles/4-server-options/tasks/main.yml b/roles/4-server-options/tasks/main.yml index 8974085e3..4c56b0572 100644 --- a/roles/4-server-options/tasks/main.yml +++ b/roles/4-server-options/tasks/main.yml @@ -13,12 +13,6 @@ when: named_install tags: base, named, network, domain -- name: Installing vector map test page - include_role: - name: osm-vector-maps - when: osm_vector_maps_install - tags: base, map - - name: Installing captive portal include_tasks: roles/captive-portal/tasks/main.yml when: captive_portal_install From 2e8a1afb3dbf84ef6be54c459670a5b641e0448a Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 May 2019 13:29:19 -0400 Subject: [PATCH 2/3] Moving osm-vector-maps install from 4-server-options? --- roles/7-edu-apps/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 4d3db3278..30b1ac489 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -27,7 +27,7 @@ when: moodle_install tags: olpc, moodle -- name: OSM_VECTOR_MAPS +- name: OSM-VECTOR-MAPS include_role: name: osm-vector-maps when: osm_vector_maps_install From 6abc8e0d5bdd6eadf0595a5cd80583c46eacc8b1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 19 May 2019 13:35:31 -0400 Subject: [PATCH 3/3] Ansible tags osm & maps (it was 3 tags, now it's 2!) --- roles/7-edu-apps/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/7-edu-apps/tasks/main.yml b/roles/7-edu-apps/tasks/main.yml index 30b1ac489..6acb282d9 100644 --- a/roles/7-edu-apps/tasks/main.yml +++ b/roles/7-edu-apps/tasks/main.yml @@ -31,14 +31,14 @@ include_role: name: osm-vector-maps when: osm_vector_maps_install - tags: osm + tags: osm, maps # UNMAINTAINED - name: OSM include_role: name: osm when: osm_install is defined and osm_install - tags: osm + tags: osm, maps # UNMAINTAINED - name: PATHAGAR