Merge pull request #1150 from holta/osm-deemphasize-old-way

De-emphasize old OSM approach: implements #1143 for faster/cleaner install
2025-02-13 11:42:08 +00:00 · 2018-09-19 20:31:13 -04:00 · 2018-09-19 20:31:13 -04:00 · fdced708a9
commit fdced708a9
parent 159115b92c d155bb5797
8 changed files with 60 additions and 23 deletions
--- a/roles/7-edu-apps/tasks/main.yml
+++ b/roles/7-edu-apps/tasks/main.yml
@ -30,7 +30,7 @@
 - name: OSM
  include_role:
    name: osm
-  when: osm_install
+  when: osm_install is defined and osm_install
  tags: osm

 - name: PATHAGAR
--- a/roles/httpd/files/osm.conf
+++ b/roles/httpd/files/osm.conf
@ -0,0 +1,3 @@
+# 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/
--- a/roles/httpd/tasks/main.yml
+++ b/roles/httpd/tasks/main.yml
@ -170,6 +170,23 @@
    state: absent
  when: is_debuntu

+# SEE https://github.com/iiab/iiab/issues/1143 as the old roles/osm playbook is rarely used as of late 2018 (if anybody still uses roles/osm, they can overwrite osm.conf using the original osm playbook, or in other ways)
+- name: Copy osm.conf for http://box/maps (all OS's)
+  copy:
+    src: osm.conf
+    dest: "/etc/{{ apache_config_dir }}"
+    owner: root
+    group: root
+    mode: 0644
+    backup: yes
+
+- name: Create link from sites-enabled to sites-available (debuntu)
+  file:
+    src: "/etc/{{ apache_config_dir }}/osm.conf"
+    dest: /etc/apache2/sites-enabled/osm.conf
+    state: link
+  when: is_debuntu
+
 - include_tasks: html.yml
  tags:
    - base
--- a/roles/osm/templates/osm.conf.j2
+++ b/roles/osm/templates/osm.conf.j2
@ -8,9 +8,10 @@ WSGIScriptAlias /iiab {{ doc_root }}/osm.wsgi
 # For old bitmap/raster tileset
 Alias /iiabstatic {{ osm_path }}/static

-# 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/
+# 2018-09-19: placement of osm.conf (for http://box/maps) moved to roles/httpd/tasks/main.yml to economize ~5 min during RPi install, now that this (older) osm playbook is rarely used
+## 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/

 <Directory {{ osm_path }}/static>
 	require all granted
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@ -310,13 +310,6 @@ iiab_zim_path: /library/zims
 moodle_install: False
 moodle_enabled: False

-# OpenStreetMap (OSM)
-osm_install: True
-osm_enabled: False
-# changed in June 2017 from:
-# iiab_install: True
-# iiab_enabled: False
-
 # Sugarizer
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
@ -423,6 +416,17 @@ calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web


+# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018:
+# - http://download.iiab.io/content/OSM/vector-tiles/
+# - http://oer2go.org/viewmod/en-worldmap-10
+#
+# OpenStreetMap (OSM) legacy - unmaintained:
+# osm_install: False
+# osm_enabled: False
+# Changed in June 2017, from the original:
+# iiab_install: True
+# iiab_enabled: False
+
 # TeamViewer - unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False
--- a/vars/local_vars_big.yml
+++ b/vars/local_vars_big.yml
@ -174,10 +174,6 @@ kiwix_enabled: True
 moodle_install: True
 moodle_enabled: True

-# OpenStreetMap: renamed from {iiab_install, iiab_enabled} in June 2017
-osm_install: True
-osm_enabled: True
-
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
 sugarizer_install: True
@ -254,6 +250,14 @@ calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web


+# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018:
+# - http://download.iiab.io/content/OSM/vector-tiles/
+# - http://oer2go.org/viewmod/en-worldmap-10
+#
+# Unmaintained - OpenStreetMap (OSM) legacy
+# osm_install: False
+# osm_enabled: False
+
 # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False
--- a/vars/local_vars_medium.yml
+++ b/vars/local_vars_medium.yml
@ -174,10 +174,6 @@ kiwix_enabled: True
 moodle_install: False
 moodle_enabled: False

-# OpenStreetMap: renamed from {iiab_install, iiab_enabled} in June 2017
-osm_install: True
-osm_enabled: True
-
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
 sugarizer_install: True
@ -254,6 +250,14 @@ calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web


+# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018:
+# - http://download.iiab.io/content/OSM/vector-tiles/
+# - http://oer2go.org/viewmod/en-worldmap-10
+#
+# Unmaintained - OpenStreetMap (OSM) legacy
+# osm_install: False
+# osm_enabled: False
+
 # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False
--- a/vars/local_vars_min.yml
+++ b/vars/local_vars_min.yml
@ -174,10 +174,6 @@ kiwix_enabled: True
 moodle_install: False
 moodle_enabled: False

-# OpenStreetMap: renamed from {iiab_install, iiab_enabled} in June 2017
-osm_install: False
-osm_enabled: False
-
 # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879
 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957
 sugarizer_install: False
@ -254,6 +250,14 @@ calibreweb_url: /books
 calibreweb_home: "{{ content_base }}/calibre-web"    # /library/calibre-web


+# PLEASE CONSIDER THESE 2 NEW MAPS APPROACHES INSTEAD, AS OF 2018:
+# - http://download.iiab.io/content/OSM/vector-tiles/
+# - http://oer2go.org/viewmod/en-worldmap-10
+#
+# Unmaintained - OpenStreetMap (OSM) legacy
+# osm_install: False
+# osm_enabled: False
+
 # Unmaintained (better to install from http://teamviewer.com or prep scripts at http://download.iiab.io)
 # teamviewer_install: False
 # teamviewer_enabled: False