Merge branch 'hotfix/1.12.1'

WikiWatershed · May 3, 2016 · 3a46f98 · 3a46f98
2 parents 1ac5b14 + 9ac87df
commit 3a46f98
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/deployment/ansible/roles.yml b/deployment/ansible/roles.yml
@@ -43,7 +43,7 @@
 - src: azavea.mapnik
   version: 0.1.0
 - src: azavea.beaver
-  version: 0.1.3
+  version: 1.0.1
 - src: azavea.java
   version: 0.2.1
 - src: azavea.docker

diff --git a/deployment/ansible/roles/model-my-watershed.app/tasks/configuration.yml b/deployment/ansible/roles/model-my-watershed.app/tasks/configuration.yml
@@ -5,7 +5,7 @@
         owner=root
         group=mmw
         mode=0750
-  with_dict: app_config
+  with_dict: "{{ app_config }}"
   notify:
     - Restart mmw-app
 

diff --git a/deployment/ansible/roles/model-my-watershed.base/tasks/configuration.yml b/deployment/ansible/roles/model-my-watershed.base/tasks/configuration.yml
@@ -25,7 +25,7 @@
         owner=root
         group=mmw
         mode=0750
-  with_dict: envdir_config
+  with_dict: "{{ envdir_config }}"
   notify:
     - Restart mmw-app
     - Restart Celery
diff --git a/deployment/ansible/roles/model-my-watershed.beaver/vars/main.yml b/deployment/ansible/roles/model-my-watershed.beaver/vars/main.yml
@@ -1,3 +1,3 @@
 ---
-beaver_version: "33.3.0"
+beaver_version: "36.2.0"
 beaver_redis_url: "redis://{{ redis_host }}:{{ redis_port }}/0"
diff --git a/deployment/ansible/roles/model-my-watershed.celery-worker/tasks/configuration.yml b/deployment/ansible/roles/model-my-watershed.celery-worker/tasks/configuration.yml
@@ -5,6 +5,6 @@
         owner=root
         group=mmw
         mode=0750
-  with_dict: app_config
+  with_dict: "{{ app_config }}"
   notify:
     - Restart Celery
diff --git a/deployment/packer/template.js b/deployment/packer/template.js
@@ -111,6 +111,7 @@
                 "sleep 5",
                 "sudo apt-get update -qq",
                 "sudo apt-get install python-pip python-dev -y",
+                "sudo pip install paramiko==1.16.0",
                 "sudo pip install ansible==2.0.1.0",
                 "sudo /bin/sh -c 'echo {{user `version`}} > /srv/version.txt'"
             ]

diff --git a/src/mmw/mmw/settings/layer_settings.py b/src/mmw/mmw/settings/layer_settings.py
@@ -170,13 +170,8 @@
     {
         'type': 'mapbox',
         'display': 'Streets',
-        'url': 'https://{s}.tiles.mapbox.com/v3/ctaylor.lg2deoc9'
-               '/{z}/{x}/{y}.png',
-        'attribution': 'Map data &copy; <a href="http://openstreetmap.org">'
-                       'OpenStreetMap</a> contributors, '
-                       '<a href="http://creativecommons.org/licenses/by-sa/'
-                       '2.0/">CC-BY-SA</a>, Imagery &copy; '
-                       '<a href="http://mapbox.com">Mapbox</a>',
+        'url': 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png',
+        'attribution': '&copy; <a href="http://www.thunderforest.com/">Thunderforest</a>, &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
         'maxZoom': 18,
         'default': True,
         'basemap': True,