Merge pull request #269 from iiab/master

sync from iiab/iiab

roles/lokole/tasks/install.yml

@@ -21,7 +21,25 @@
     extra_args: --no-cache-dir    # To avoid caching issues e.g. soon after new releases hit https://pypi.org/project/opwen-email-client/
   tags:
     - install
-  when: internet_available | bool
+  when:
+    - internet_available | bool
+    - lokole_commit is undefined
+
+# For development purposes -- To install Lokole from a given commit, add the
+# following line to roles/lokole/defaults/main.yml:
+# 
+# lokole_commit: <git_commit_id>
+- name: pip install opwen_email_client (Lokole) from git commit {{ lokole_commit }} (for development purposes)
+  pip:
+    name: "git+https://github.com/ascoderu/opwen-webapp.git@{{ lokole_commit }}#egg=opwen_email_client"
+    virtualenv: "{{ lokole_venv }}"
+    virtualenv_command: python3 -m venv "{{ lokole_venv }}"
+    extra_args: --no-cache-dir    # To avoid caching issues e.g. soon after new releases hit https://pypi.org/project/opwen-email-client/
+  tags:
+    - install
+  when:
+    - internet_available | bool
+    - lokole_commit is defined
 
 - name: Compile translations
   shell: |

roles/osm-vector-maps/README.md

@@ -0,0 +1,6 @@
+# OSM Vector Maps README
+
+### Documentation
+
+- Please see [IIAB Maps](https://github.com/iiab/iiab/wiki/IIAB-Maps) for the latest implementer-focused instructions!
+- Also: ["How do I add zoomable maps for my region?"](http://FAQ.IIAB.IO#How_do_I_add_zoomable_maps_for_my_region.3F) in [FAQ.IIAB.IO](http://FAQ.IIAB.IO)

roles/osm-vector-maps/tasks/main.yml

@@ -78,7 +78,20 @@
     state: absent
   when: not osm_vector_maps_enabled and is_debuntu
 
-- name: Copy the redirect to the test page -- delete this later if more than one map
+#- name: Does the {{ vector_map_path }}/index.html redirect already exist?
+#  stat:
+#    path: "{{ vector_map_path }}/index.html"
+#  register: osm_redirect
+
+#Copy the redirect to the test page -- delete this later if more than one map
+- name: Install {{ vector_map_path }}/index.html redirect for http://box/maps -> http://box/osm-vector-maps/maplist/ if no redirect exists
   copy:
+    force: no
     src: test-index.redirect
     dest: "{{ vector_map_path }}/index.html"
+  #when: not osm_redirect.stat.exists
+
+- name: Reload Apache service ({{ apache_service }})    # e.g. apache2
+  systemd:
+    name: "{{ apache_service }}"
+    state: reloaded

roles/osm-vector-maps/templates/osm-vector-maps.conf

@@ -1,4 +1,5 @@
-# For downloadable regional vector tilesets
+# For downloadable regional vector tilesets, see https://github.com/iiab/iiab/wiki/IIAB-Maps
+Alias /map {{ vector_map_path }}
 Alias /maps {{ vector_map_path }}
 Alias /osm-vector-maps {{ vector_map_path }}
 <Directory {{ vector_map_path }}>