Format, add user account request form

[chef.git] / roles / tile.rb

diff --git a/roles/tile.rb b/roles/tile.rb
index 1da7726d863ee13be19550b7fc87d03e19a82119..d0de61bbe53c9ce5770eef973e8de5eba7b9b09b 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 => {
 default_attributes(
   :accounts => {
     :users => {

+      :pnorman => { :status => :user },

       :tile => {
       :tile => {

-        :members => [:jburgess, :tomh]
+        :members => [:jburgess, :tomh, :pnorman]

       }
     }
   },
       }
     }
   },


@@ -13,7 +14,7 @@ default_attributes(
     :mpm => "event",
     :timeout => 60,
     :event => {
     :mpm => "event",
     :timeout => 60,
     :event => {

-      :server_limit => 60,
+      :server_limit => 80,

       :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 300,
       :max_request_workers => 1200,
       :threads_per_child => 20,
       :min_spare_threads => 300,


@@ -104,7 +105,8 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",

-        :revision => "v5.5.1",
+        :revision => "v5.6.1",
+        :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh",

         :max_zoom => 19
       }
     }
         :max_zoom => 19
       }
     }