Merge remote-tracking branch 'github/pull/565'

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index ea8b27daf1fbfb913673792625acbe4969ce5ab8..a30962415e8d572bb5f1dc89e00927b98980d761 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -4,8 +4,9 @@ description "Role applied to all tile servers"
 default_attributes(
   :accounts => {
     :users => {
+      :pnorman => { :status => :administrator },
       :tile => {
-        :members => [:jburgess, :tomh]
+        :members => [:jburgess, :tomh, :pnorman]
       }
     }
   },
@@ -104,7 +105,8 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v5.5.1",
+        :revision => "v5.7.0",
+        :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",
         :max_zoom => 19
       }
     }