More files than just waterpoly, #12

pillar/tm.sls

@@ -1,4 +1,6 @@
-  # Copy top.sls and tm.sls to /srv/pillar, then change the settings below.
+# Copy top.sls and tm.sls to /srv/pillar, then change the settings below.
+
+# Indentation matters! This must be a syntactically correct YAML file.
 
 tm_username: tm                       # Username/password for basic htpasswd authentication
 tm_password: pumpkin                  
@@ -17,7 +19,9 @@ tm_fonts:       # List of urls that provide zip downloads
   - http://www.fontsquirrel.com/fonts/download/roboto
 
   # (Optional)
-tm_waterpolygonsource: http://gis.researchmaps.net/water-polygons-split-3857.zip
+tm_extrafiles: 
+  - http://gis.researchmaps.net/water-polygons-split-3857.zip
+  - http://gis.researchmaps.net/land-polygons-split-3857.zip
 
   # (Optional)
 tm_projects: # Sample projects to unzip in /usr/share/mapbox/project.

pillar/top.sls

@@ -1,4 +1,8 @@
 # Copy top.sls and tm.sls to /srv/pillar, then change the settings below.
+
+# Indentation matters! 
+
 base:
   '*':
-    - tm
+    - tm
+    # - workshops

pillar/workshops.sls

@@ -0,0 +1,6 @@
+# This settings file is used for "Mapping for academics" workshops.
+tm_osmsourceurl: http://gis.researchmaps.net/australia-latest.osm.pbf
+
+tm_projects: # Sample projects to unzip in /usr/share/mapbox/project.
+  - { name: mapstarter, source: "http://gis.researchmaps.net/sample/map-starter.zip" }
+  - { name: melbourne, source: "http://gis.researchmaps.net/sample/melbourne.zip" } 

tilemill/extrafiles.sls

@@ -0,0 +1,27 @@
+# Install water polygon shapefile. This is needed for working with OpenStreetMap data extracts.
+# TODO: figure out how to make the shapefile a 'favourite'
+extrafiles:
+  pkg.installed:
+    - names: 
+       - unzip 
+       - wget
+  cmd.run:
+    - cwd: /usr/share/mapbox
+    - user: mapbox
+    - group: mapbox
+    - require:
+        - pkg: unzip
+    - name: |
+        {% for f in pillar.tm_extrafiles %}
+        wget -nv {{ f }}
+        {% endfor %}
+        sleep 5
+        yes no | unzip '*.zip' # Don't overwrite any existing files
+        unzip -f '*.zip' # Freshen existing files if needed
+    # - unless: test -d /usr/share/mapbox/water-polygons-split-3857 # should we bother trying to not repeat?
+
+extrafiles_logdone:
+  cmd.wait_script:
+    - source: salt://log.sh
+    - args: "'Extra tilemill files downloaded and unzipped.'"
+    - watch: [ { cmd: extrafiles } ]

tilemill/init.sls

@@ -4,8 +4,8 @@ include:
   - .fonts
     {% endif %}
   - .tilemillinstall
-    {% if pillar.tm_waterpolygonsource is defined %}
-  - .waterpolygons
+    {% if pillar.tm_tilemillextras is defined %}
+  - .tilemillextras
     {% endif %}
     {% if pillar.tm_projects is defined %}
   - .projects